Fix error when creating a fresh database

[github/Chocobozzz/PeerTube.git] / server / initializers / database.ts

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 1383bb33ba29e451e0b87753f1feda176942e46b..0a716e4fb0fc34e95f84fa58bb9fc00ab86694b6 100644 (file)
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -18,7 +18,7 @@ import { UserModel } from '../models/account/user-interface'
 import { AccountVideoRateModel } from '../models/account/account-video-rate-interface'
 import { AccountFollowModel } from '../models/account/account-follow-interface'
 import { TagModel } from './../models/video/tag-interface'
-import { PodModel } from './../models/pod/pod-interface'
+import { ServerModel } from '../models/server/server-interface'
 import { OAuthTokenModel } from './../models/oauth/oauth-token-interface'
 import { OAuthClientModel } from './../models/oauth/oauth-client-interface'
 import { JobModel } from './../models/job/job-interface'
@@ -38,7 +38,7 @@ const database: {
   Job?: JobModel,
   OAuthClient?: OAuthClientModel,
   OAuthToken?: OAuthTokenModel,
-  Pod?: PodModel,
+  Server?: ServerModel,
   Tag?: TagModel,
   AccountVideoRate?: AccountVideoRateModel,
   AccountFollow?: AccountFollowModel,
@@ -89,7 +89,12 @@ database.init = async (silent: boolean) => {
 
   for (const modelName of Object.keys(database)) {
     if ('associate' in database[modelName]) {
-      database[modelName].associate(database)
+      try {
+        database[modelName].associate(database)
+      } catch (err) {
+        logger.error('Cannot associate model %s.', modelName, err)
+        process.exit(0)
+      }
     }
   }