X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=e3cddfd33a643a623cfa53932fc34adca138c673;hb=53d43fc9147059f3d265140e025a6ebd802481dc;hp=8a762a9054ccb7628b8503dfc45b2b9462f3c8f6;hpb=6c8c15f914cd375da1db5d0cd4d924a86c53d4c1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index 8a762a905..e3cddfd33 100644
--- a/server.ts
+++ b/server.ts
@@ -158,7 +158,8 @@ morgan.token('user-agent', (req: express.Request) => {
   return req.get('user-agent')
 })
 app.use(morgan('combined', {
-  stream: { write: logger.info.bind(logger) }
+  stream: { write: logger.info.bind(logger) },
+  skip: req => CONFIG.LOG.LOG_PING_REQUESTS === false && req.originalUrl === '/api/v1/ping'
 }))
 
 // For body requests
@@ -249,7 +250,7 @@ async function startApplication () {
   Emailer.Instance.init()
 
   await Promise.all([
-    Emailer.Instance.checkConnectionOrDie(),
+    Emailer.Instance.checkConnection(),
     JobQueue.Instance.init()
   ])
 
@@ -283,7 +284,7 @@ async function startApplication () {
 
   // Make server listening
   server.listen(port, hostname, () => {
-    logger.info('Server listening on %s:%d', hostname, port)
+    logger.info('HTTP server listening on %s:%d', hostname, port)
     logger.info('Web server: %s', WEBSERVER.URL)
 
     Hooks.runAction('action:application.listening')