aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/assets/player/peertube-player-manager.ts2
-rwxr-xr-xscripts/parse-log.ts15
2 files changed, 15 insertions, 2 deletions
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index 1ff3a010e..fcf0d0f41 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -223,7 +223,7 @@ export class PeertubePlayerManager {
223 const plugins: VideoJSPluginOptions = { 223 const plugins: VideoJSPluginOptions = {
224 peertube: { 224 peertube: {
225 mode, 225 mode,
226 autoplay, // Use peertube plugin autoplay because we get the file by webtorrent 226 autoplay, // Use peertube plugin autoplay because we could get the file by webtorrent
227 videoViewUrl: commonOptions.videoViewUrl, 227 videoViewUrl: commonOptions.videoViewUrl,
228 videoDuration: commonOptions.videoDuration, 228 videoDuration: commonOptions.videoDuration,
229 userWatching: commonOptions.userWatching, 229 userWatching: commonOptions.userWatching,
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 065fe7e82..045348e86 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -10,6 +10,7 @@ import { labelFormatter } from '../server/helpers/logger'
10import { CONFIG } from '../server/initializers/config' 10import { CONFIG } from '../server/initializers/config'
11import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs' 11import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs'
12import { inspect } from 'util' 12import { inspect } from 'util'
13import { format as sqlFormat } from 'sql-formatter'
13 14
14program 15program
15 .option('-l, --level [level]', 'Level log (debug/info/warn/error)') 16 .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
@@ -21,7 +22,8 @@ const excludedKeys = {
21 message: true, 22 message: true,
22 splat: true, 23 splat: true,
23 timestamp: true, 24 timestamp: true,
24 label: true 25 label: true,
26 sql: true
25} 27}
26function keysExcluder (key, value) { 28function keysExcluder (key, value) {
27 return excludedKeys[key] === true ? undefined : value 29 return excludedKeys[key] === true ? undefined : value
@@ -32,6 +34,17 @@ const loggerFormat = winston.format.printf((info) => {
32 if (additionalInfos === '{}') additionalInfos = '' 34 if (additionalInfos === '{}') additionalInfos = ''
33 else additionalInfos = ' ' + additionalInfos 35 else additionalInfos = ' ' + additionalInfos
34 36
37 if (info.sql) {
38 if (CONFIG.LOG.PRETTIFY_SQL) {
39 additionalInfos += '\n' + sqlFormat(info.sql, {
40 language: 'sql',
41 ident: ' '
42 })
43 } else {
44 additionalInfos += ' - ' + info.sql
45 }
46 }
47
35 return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}` 48 return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
36}) 49})
37 50