fix(core): sync is done correctly when enabling bpfs first time

botpress · Dec 5, 2019 · 20c8fba · 20c8fba
1 parent c36ad89
commit 20c8fba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/src/bp/bootstrap.ts b/src/bp/bootstrap.ts
@@ -18,10 +18,10 @@ import { setupMasterNode } from './cluster'
 import { FatalError } from './errors'
 
 async function setupEnv() {
-  const useDbDriver = process.BPFS_STORAGE === 'database'
-  Ghost.initialize(useDbDriver)
-
   await Db.initialize()
+
+  const useDbDriver = process.BPFS_STORAGE === 'database'
+  await Ghost.initialize(useDbDriver)
 }
 
 async function getLogger(loggerName: string) {

diff --git a/src/bp/core/botpress.ts b/src/bp/core/botpress.ts
@@ -273,21 +273,6 @@ export class Botpress {
     await Promise.map(botsToMount, botId => this.botService.mountBot(botId))
   }
 
-  @WrapErrorsWith('Error initializing Ghost Service')
-  async initializeGhost(): Promise<void> {
-    const useDbDriver = process.BPFS_STORAGE === 'database'
-    this.ghostService.initialize(useDbDriver)
-    const global = await this.ghostService.global().directoryListing('/')
-
-    if (useDbDriver && _.isEmpty(global)) {
-      this.logger.info('Syncing data/global/ to database')
-      await this.ghostService.global().sync()
-
-      this.logger.info('Syncing data/bots/ to database')
-      await this.ghostService.bots().sync()
-    }
-  }
-
   private async initializeServices() {
     await this.loggerDbPersister.initialize(this.database, await this.loggerProvider('LogDbPersister'))
     this.loggerDbPersister.start()

diff --git a/src/bp/core/services/ghost/service.ts b/src/bp/core/services/ghost/service.ts
@@ -61,9 +61,19 @@ export class GhostService {
     this.cache.events.on && this.cache.events.on('syncDbFilesToDisk', this._onSyncReceived)
   }
 
-  initialize(enabled: boolean) {
-    this.enabled = enabled
+  async initialize(useDbDriver: boolean) {
+    this.enabled = useDbDriver
     this._scopedGhosts.clear()
+
+    const global = await this.global().directoryListing('/')
+
+    if (useDbDriver && _.isEmpty(global)) {
+      this.logger.info('Syncing data/global/ to database')
+      await this.global().sync()
+
+      this.logger.info('Syncing data/bots/ to database')
+      await this.bots().sync()
+    }
   }
 
   // Not caching this scope since it's rarely used