Fix log initialization (microsoft#1755)

SparkSnail · Nov 22, 2019 · 5845ca0 · 5845ca0
1 parent a63f2ed
commit 5845ca0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/nni_manager/common/log.ts b/src/nni_manager/common/log.ts
@@ -155,11 +155,7 @@ class Logger {
     }
 }
 
-function getLogger(fileName?: string): Logger {
-    component.Container.bind(Logger).provider({
-        get: (): Logger => new Logger(fileName)
-    });
-
+function getLogger(): Logger {
     return component.get(Logger);
 }
 

diff --git a/src/nni_manager/main.ts b/src/nni_manager/main.ts
@@ -49,7 +49,7 @@ function initStartupInfo(
     setExperimentStartupInfo(createNew, expId, basePort, logDirectory, experimentLogLevel, readonly);
 }
 
-async function initContainer(platformMode: string): Promise<void> {
+async function initContainer(platformMode: string, logFileName?: string): Promise<void> {
     if (platformMode === 'local') {
         Container.bind(TrainingService)
             .to(LocalTrainingService)
@@ -82,6 +82,9 @@ async function initContainer(platformMode: string): Promise<void> {
     Container.bind(DataStore)
         .to(NNIDataStore)
         .scope(Scope.Singleton);
+    Container.bind(Logger).provider({
+        get: (): Logger => new Logger(logFileName)
+    });
     const ds: DataStore = component.get(DataStore);
 
     await ds.init();
@@ -145,13 +148,14 @@ initStartupInfo(startMode, experimentId, port, logDir, logLevel, readonly);
 
 mkDirP(getLogDir())
     .then(async () => {
-    const log: Logger = getLogger();
     try {
         await initContainer(mode);
         const restServer: NNIRestServer = component.get(NNIRestServer);
         await restServer.start();
+        const log: Logger = getLogger();
         log.info(`Rest server listening on: ${restServer.endPoint}`);
     } catch (err) {
+        const log: Logger = getLogger();
         log.error(`${err.stack}`);
         throw err;
     }