aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-31 11:43:46 +0200
committerChocobozzz <me@florianbigard.com>2018-08-31 11:43:46 +0200
commit328e607d32d7f1e960f8966a70097b030e386ab4 (patch)
tree348297cadda55d616ece20a39ff1a827ece0c7d8
parentd6ca951b3cc7cb19ad9f52249444fc68c5d81d50 (diff)
downloadPeerTube-328e607d32d7f1e960f8966a70097b030e386ab4.tar.gz
PeerTube-328e607d32d7f1e960f8966a70097b030e386ab4.tar.zst
PeerTube-328e607d32d7f1e960f8966a70097b030e386ab4.zip
Add sql trace in error log on sequelize error
-rw-r--r--server.ts5
-rw-r--r--server/helpers/logger.ts8
-rw-r--r--server/middlewares/cache.ts4
3 files changed, 14 insertions, 3 deletions
diff --git a/server.ts b/server.ts
index eccd19919..2db39ab06 100644
--- a/server.ts
+++ b/server.ts
@@ -166,7 +166,10 @@ app.use(function (err, req, res, next) {
166 error = err.stack || err.message || err 166 error = err.stack || err.message || err
167 } 167 }
168 168
169 logger.error('Error in controller.', { err: error }) 169 // Sequelize error
170 const sql = err.parent ? err.parent.sql : undefined
171
172 logger.error('Error in controller.', { err: error, sql })
170 return res.status(err.status || 500).end() 173 return res.status(err.status || 500).end()
171}) 174})
172 175
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index ce6e38f15..e1e3a1fe2 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -22,7 +22,13 @@ function loggerReplacer (key: string, value: any) {
22} 22}
23 23
24const consoleLoggerFormat = winston.format.printf(info => { 24const consoleLoggerFormat = winston.format.printf(info => {
25 let additionalInfos = JSON.stringify(info.meta || info.err, loggerReplacer, 2) 25 const obj = {
26 meta: info.meta,
27 err: info.err,
28 sql: info.sql
29 }
30
31 let additionalInfos = JSON.stringify(obj, loggerReplacer, 2)
26 if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = '' 32 if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
27 else additionalInfos = ' ' + additionalInfos 33 else additionalInfos = ' ' + additionalInfos
28 34
diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index b40486e4b..1b44957d3 100644
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -31,6 +31,8 @@ function cacheRoute (lifetimeArg: string | number) {
31 logger.error('Cannot cache route.', { err }) 31 logger.error('Cannot cache route.', { err })
32 return done(err) 32 return done(err)
33 }) 33 })
34 } else {
35 done()
34 } 36 }
35 37
36 return sendSave(body) 38 return sendSave(body)
@@ -52,7 +54,7 @@ function cacheRoute (lifetimeArg: string | number) {
52 return done() 54 return done()
53 }) 55 })
54 } catch (err) { 56 } catch (err) {
55 logger.error('Cannot serve cached route.', err) 57 logger.error('Cannot serve cached route.', { err })
56 return next() 58 return next()
57 } 59 }
58 } 60 }