diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-25 10:08:29 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-05-25 11:34:43 +0200 |
commit | 008af5c9bb26b6a28db604d10356b4272d9c0432 (patch) | |
tree | 1f5776b47b597c0db1ede8829022bafad2eb01bd | |
parent | 8bb6e70be3c7199a0503aca302b4b32317520db3 (diff) | |
download | PeerTube-008af5c9bb26b6a28db604d10356b4272d9c0432.tar.gz PeerTube-008af5c9bb26b6a28db604d10356b4272d9c0432.tar.zst PeerTube-008af5c9bb26b6a28db604d10356b4272d9c0432.zip |
Fix broadcast message log level
-rw-r--r-- | config/default.yaml | 4 | ||||
-rw-r--r-- | config/production.yaml.example | 2 | ||||
-rw-r--r-- | server/initializers/checker-after-init.ts | 2 | ||||
-rw-r--r-- | server/tests/api/server/plugins.ts | 2 | ||||
-rw-r--r-- | support/docker/production/config/production.yaml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/config/default.yaml b/config/default.yaml index 370a77925..9b90bacfc 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -96,7 +96,7 @@ storage: | |||
96 | client_overrides: 'storage/client-overrides/' | 96 | client_overrides: 'storage/client-overrides/' |
97 | 97 | ||
98 | log: | 98 | log: |
99 | level: 'info' # debug/info/warning/error | 99 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
100 | rotation: | 100 | rotation: |
101 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate | 101 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
102 | maxFileSize: 12MB | 102 | maxFileSize: 12MB |
@@ -474,7 +474,7 @@ theme: | |||
474 | broadcast_message: | 474 | broadcast_message: |
475 | enabled: false | 475 | enabled: false |
476 | message: '' # Support markdown | 476 | message: '' # Support markdown |
477 | level: 'info' # 'info' | 'warn' | 'error' | 477 | level: 'info' # 'info' | 'warning' | 'error' |
478 | dismissable: false | 478 | dismissable: false |
479 | 479 | ||
480 | search: | 480 | search: |
diff --git a/config/production.yaml.example b/config/production.yaml.example index fed6b45ca..47ef47279 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -94,7 +94,7 @@ storage: | |||
94 | client_overrides: '/var/www/peertube/storage/client-overrides/' | 94 | client_overrides: '/var/www/peertube/storage/client-overrides/' |
95 | 95 | ||
96 | log: | 96 | log: |
97 | level: 'info' # debug/info/warning/error | 97 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
98 | rotation: | 98 | rotation: |
99 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate | 99 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
100 | maxFileSize: 12MB | 100 | maxFileSize: 12MB |
diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index 5fd1af82f..a93c8b7fd 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts | |||
@@ -132,7 +132,7 @@ function checkConfig () { | |||
132 | // Broadcast message | 132 | // Broadcast message |
133 | if (CONFIG.BROADCAST_MESSAGE.ENABLED) { | 133 | if (CONFIG.BROADCAST_MESSAGE.ENABLED) { |
134 | const currentLevel = CONFIG.BROADCAST_MESSAGE.LEVEL | 134 | const currentLevel = CONFIG.BROADCAST_MESSAGE.LEVEL |
135 | const available = [ 'info', 'warn', 'error' ] | 135 | const available = [ 'info', 'warning', 'error' ] |
136 | 136 | ||
137 | if (available.includes(currentLevel) === false) { | 137 | if (available.includes(currentLevel) === false) { |
138 | return 'Broadcast message level should be ' + available.join(' or ') + ' instead of ' + currentLevel | 138 | return 'Broadcast message level should be ' + available.join(' or ') + ' instead of ' + currentLevel |
diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts index 1c6eabe6d..f4190c352 100644 --- a/server/tests/api/server/plugins.ts +++ b/server/tests/api/server/plugins.ts | |||
@@ -290,7 +290,7 @@ describe('Test plugins', function () { | |||
290 | }) | 290 | }) |
291 | 291 | ||
292 | it('Should update the plugin and the theme', async function () { | 292 | it('Should update the plugin and the theme', async function () { |
293 | this.timeout(30000) | 293 | this.timeout(90000) |
294 | 294 | ||
295 | // Wait the scheduler that get the latest plugins versions | 295 | // Wait the scheduler that get the latest plugins versions |
296 | await wait(6000) | 296 | await wait(6000) |
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml index 688f88edd..5cb39e268 100644 --- a/support/docker/production/config/production.yaml +++ b/support/docker/production/config/production.yaml | |||
@@ -62,7 +62,7 @@ storage: | |||
62 | client_overrides: '../data/client-overrides/' | 62 | client_overrides: '../data/client-overrides/' |
63 | 63 | ||
64 | log: | 64 | log: |
65 | level: 'info' # debug/info/warn/error | 65 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
66 | 66 | ||
67 | tracker: | 67 | tracker: |
68 | enabled: true | 68 | enabled: true |