瀏覽代碼

fix(home-server): add debug logs about container initalizations

Karol Sójko 2 年之前
父節點
當前提交
0df471585f

+ 6 - 3
packages/api-gateway/src/Bootstrap/Container.ts

@@ -46,17 +46,18 @@ export class ContainerConfigLoader {
       winstonFormatters.push(newrelicWinstonFormatter())
     }
 
+    let logger: winston.Logger
     if (configuration?.logger) {
-      container.bind<winston.Logger>(TYPES.Logger).toConstantValue(configuration.logger as winston.Logger)
+      logger = configuration.logger as winston.Logger
     } else {
-      const logger = winston.createLogger({
+      logger = winston.createLogger({
         level: env.get('LOG_LEVEL', true) || 'info',
         format: winston.format.combine(...winstonFormatters),
         transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL', true) || 'info' })],
         defaultMeta: { service: 'api-gateway' },
       })
-      container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
     }
+    container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
     if (!isConfiguredForInMemoryCache) {
       const redisUrl = env.get('REDIS_URL')
@@ -125,6 +126,8 @@ export class ContainerConfigLoader {
       .bind<EndpointResolverInterface>(TYPES.EndpointResolver)
       .toConstantValue(new EndpointResolver(isConfiguredForHomeServer))
 
+    logger.debug('Configuration complete')
+
     return container
   }
 }

+ 26 - 21
packages/auth/src/Bootstrap/Container.ts

@@ -268,9 +268,33 @@ export class ContainerConfigLoader {
 
     const container = new Container()
 
+    const winstonFormatters = [winston.format.splat(), winston.format.json()]
+    if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
+      await import('newrelic')
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const newrelicFormatter = require('@newrelic/winston-enricher')
+      const newrelicWinstonFormatter = newrelicFormatter(winston)
+      winstonFormatters.push(newrelicWinstonFormatter())
+    }
+
+    let logger: winston.Logger
+    if (configuration?.logger) {
+      logger = configuration.logger as winston.Logger
+    } else {
+      logger = winston.createLogger({
+        level: env.get('LOG_LEVEL', true) || 'info',
+        format: winston.format.combine(...winstonFormatters),
+        transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL', true) || 'info' })],
+        defaultMeta: { service: 'auth' },
+      })
+    }
+    container.bind<winston.Logger>(TYPES.Auth_Logger).toConstantValue(logger)
+
     const appDataSource = new AppDataSource(env)
     await appDataSource.initialize()
 
+    logger.debug('Database initialized')
+
     const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
     const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
 
@@ -287,27 +311,6 @@ export class ContainerConfigLoader {
       container.bind(TYPES.Auth_Redis).toConstantValue(redis)
     }
 
-    const winstonFormatters = [winston.format.splat(), winston.format.json()]
-    if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
-      await import('newrelic')
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const newrelicFormatter = require('@newrelic/winston-enricher')
-      const newrelicWinstonFormatter = newrelicFormatter(winston)
-      winstonFormatters.push(newrelicWinstonFormatter())
-    }
-
-    if (configuration?.logger) {
-      container.bind<winston.Logger>(TYPES.Auth_Logger).toConstantValue(configuration.logger as winston.Logger)
-    } else {
-      const logger = winston.createLogger({
-        level: env.get('LOG_LEVEL', true) || 'info',
-        format: winston.format.combine(...winstonFormatters),
-        transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL', true) || 'info' })],
-        defaultMeta: { service: 'auth' },
-      })
-      container.bind<winston.Logger>(TYPES.Auth_Logger).toConstantValue(logger)
-    }
-
     container.bind<TimerInterface>(TYPES.Auth_Timer).toConstantValue(new Timer())
 
     if (!isConfiguredForHomeServer) {
@@ -1201,6 +1204,8 @@ export class ContainerConfigLoader {
         )
     }
 
+    logger.debug('Configuration complete')
+
     return container
   }
 }

+ 6 - 2
packages/files/src/Bootstrap/Container.ts

@@ -70,11 +70,13 @@ export class ContainerConfigLoader {
     const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
     const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
 
+    let logger: winston.Logger
     if (configuration?.logger) {
-      container.bind<winston.Logger>(TYPES.Files_Logger).toConstantValue(configuration.logger as winston.Logger)
+      logger = configuration.logger as winston.Logger
     } else {
-      container.bind<winston.Logger>(TYPES.Files_Logger).toConstantValue(this.createLogger({ env }))
+      logger = this.createLogger({ env })
     }
+    container.bind<winston.Logger>(TYPES.Files_Logger).toConstantValue(logger)
 
     container.bind<TimerInterface>(TYPES.Files_Timer).toConstantValue(new Timer())
 
@@ -249,6 +251,8 @@ export class ContainerConfigLoader {
         )
     }
 
+    logger.debug('Configuration complete')
+
     return container
   }
 

+ 0 - 1
packages/home-server/src/Server/HomeServer.ts

@@ -38,7 +38,6 @@ export class HomeServer implements HomeServerInterface {
         CACHE_TYPE: 'memory',
         DB_SQLITE_DATABASE_PATH: `${configuration.dataDirectoryPath}/database/home_server.sqlite`,
         FILE_UPLOAD_PATH: `${configuration.dataDirectoryPath}/uploads`,
-        LOG_LEVEL: 'info',
         ...configuration.environment,
         MODE: 'home-server',
         NEW_RELIC_ENABLED: 'false',

+ 13 - 9
packages/revisions/src/Bootstrap/Container.ts

@@ -67,13 +67,9 @@ export class ContainerConfigLoader {
       defaultScope: 'Singleton',
     })
 
-    const appDataSource = new AppDataSource(env)
-    await appDataSource.initialize()
-
-    container.bind<Env>(TYPES.Revisions_Env).toConstantValue(env)
-
+    let logger: winston.Logger
     if (configuration?.logger) {
-      container.bind<winston.Logger>(TYPES.Revisions_Logger).toConstantValue(configuration.logger as winston.Logger)
+      logger = configuration.logger as winston.Logger
     } else {
       const winstonFormatters = [winston.format.splat(), winston.format.json()]
       if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
@@ -84,15 +80,21 @@ export class ContainerConfigLoader {
         winstonFormatters.push(newrelicWinstonFormatter())
       }
 
-      const logger = winston.createLogger({
+      logger = winston.createLogger({
         level: env.get('LOG_LEVEL', true) || 'info',
         format: winston.format.combine(...winstonFormatters),
         transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL', true) || 'info' })],
         defaultMeta: { service: 'revisions' },
       })
-
-      container.bind<winston.Logger>(TYPES.Revisions_Logger).toConstantValue(logger)
     }
+    container.bind<winston.Logger>(TYPES.Revisions_Logger).toConstantValue(logger)
+
+    const appDataSource = new AppDataSource(env)
+    await appDataSource.initialize()
+
+    logger.debug('Database initialized')
+
+    container.bind<Env>(TYPES.Revisions_Env).toConstantValue(env)
 
     container.bind(TYPES.Revisions_NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
     container.bind(TYPES.Revisions_VERSION).toConstantValue(env.get('VERSION', true) ?? 'development')
@@ -350,6 +352,8 @@ export class ContainerConfigLoader {
         )
     }
 
+    logger.debug('Configuration complete')
+
     return container
   }
 }

+ 15 - 11
packages/syncing-server/src/Bootstrap/Container.ts

@@ -95,15 +95,9 @@ export class ContainerConfigLoader {
       defaultScope: 'Singleton',
     })
 
-    const appDataSource = new AppDataSource(env)
-    await appDataSource.initialize()
-
-    const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
-
-    container.bind<Env>(TYPES.Sync_Env).toConstantValue(env)
-
+    let logger: winston.Logger
     if (configuration?.logger) {
-      container.bind<winston.Logger>(TYPES.Sync_Logger).toConstantValue(configuration.logger as winston.Logger)
+      logger = configuration.logger as winston.Logger
     } else {
       const winstonFormatters = [winston.format.splat(), winston.format.json()]
       if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
@@ -114,15 +108,23 @@ export class ContainerConfigLoader {
         winstonFormatters.push(newrelicWinstonFormatter())
       }
 
-      const logger = winston.createLogger({
+      logger = winston.createLogger({
         level: env.get('LOG_LEVEL', true) || 'info',
         format: winston.format.combine(...winstonFormatters),
         transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL', true) || 'info' })],
         defaultMeta: { service: 'syncing-server' },
       })
-
-      container.bind<winston.Logger>(TYPES.Sync_Logger).toConstantValue(logger)
     }
+    container.bind<winston.Logger>(TYPES.Sync_Logger).toConstantValue(logger)
+
+    const appDataSource = new AppDataSource(env)
+    await appDataSource.initialize()
+
+    logger.debug('Database initialized')
+
+    const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
+
+    container.bind<Env>(TYPES.Sync_Env).toConstantValue(env)
 
     if (isConfiguredForHomeServer) {
       container
@@ -517,6 +519,8 @@ export class ContainerConfigLoader {
         )
     }
 
+    logger.debug('Configuration complete')
+
     return container
   }
 }