X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server.ts;h=e83fabb98f95aca778367e2f5e2fc6bf0c2cfdb1;hb=99315dc26014c0320d5bfc53bab815eb4cc3e1e9;hp=e18e2be5c305c68a8fa8b74c4b899682ea3377c6;hpb=80fdaf064562aff968f4c9cea1cf220bc12a70da;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index e18e2be5c..e83fabb98 100644
--- a/server.ts
+++ b/server.ts
@@ -70,7 +70,9 @@ if (CONFIG.CSP.ENABLED) {
 // ----------- Database -----------
 
 // Initialize database and models
-import { initDatabaseModels } from './server/initializers/database'
+import { initDatabaseModels, checkDatabaseConnectionOrDie } from './server/initializers/database'
+checkDatabaseConnectionOrDie()
+
 import { migrate } from './server/initializers/migrator'
 migrate()
   .then(() => initDatabaseModels(false))
@@ -137,14 +139,14 @@ if (isTestInstance()) {
 }
 
 // For the logger
-morgan.token('remote-addr', req => {
+morgan.token<express.Request>('remote-addr', req => {
   if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') {
     return anonymize(req.ip, 16, 16)
   }
 
   return req.ip
 })
-morgan.token('user-agent', req => {
+morgan.token<express.Request>('user-agent', req => {
   if (req.get('DNT') === '1') {
     return useragent.parse(req.get('user-agent')).family
   }