Просмотр исходного кода

fix installing process for redundant environment

Yuki Takei 4 лет назад
Родитель
Сommit
fd1c0022ff
2 измененных файлов с 10 добавлено и 14 удалено
  1. 10 8
      packages/app/src/server/service/app.ts
  2. 0 6
      packages/app/src/server/service/installer.ts

+ 10 - 8
packages/app/src/server/service/app.ts

@@ -47,6 +47,12 @@ export default class AppService implements S2sMessageHandlable {
     const isDBInitialized = await this.isDBInitialized(true);
     const isDBInitialized = await this.isDBInitialized(true);
     if (isDBInitialized) {
     if (isDBInitialized) {
       this.setupAfterInstall();
       this.setupAfterInstall();
+
+      // remove message handler
+      const { s2sMessagingService } = this;
+      if (s2sMessagingService != null) {
+        this.s2sMessagingService.removeMessageHandler(this);
+      }
     }
     }
   }
   }
 
 
@@ -107,14 +113,10 @@ export default class AppService implements S2sMessageHandlable {
     return this.configManager.getConfigFromDB('crowi', 'app:installed');
     return this.configManager.getConfigFromDB('crowi', 'app:installed');
   }
   }
 
 
-  setupAfterInstall() {
-    this.publishPostInstallationMessage();
-
-    // remove message handler
-    const { s2sMessagingService } = this;
-    if (s2sMessagingService != null) {
-      this.s2sMessagingService.removeMessageHandler(this);
-    }
+  async setupAfterInstall(): Promise<void> {
+    await this.crowi.pluginService.autoDetectAndLoadPlugins();
+    this.crowi.setupRoutesAtLast();
+    this.crowi.setupGlobalErrorHandlers();
   }
   }
 
 
 }
 }

+ 0 - 6
packages/app/src/server/service/installer.ts

@@ -112,12 +112,6 @@ export class InstallerService {
     // create initial pages
     // create initial pages
     await this.createInitialPages(adminUser, language);
     await this.createInitialPages(adminUser, language);
 
 
-    const pluginService = this.crowi.pluginService;
-    await pluginService.autoDetectAndLoadPlugins();
-
-    this.crowi.setupRoutesAtLast();
-    this.crowi.setupGlobalErrorHandlers();
-
     const appService: AppService = this.crowi.appService;
     const appService: AppService = this.crowi.appService;
     appService.setupAfterInstall();
     appService.setupAfterInstall();