aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-25 10:08:29 +0200
committerChocobozzz <me@florianbigard.com>2021-05-25 11:35:29 +0200
commit31a911190b27d93f6324da3d826f96c7fbc5deb6 (patch)
treeeaf00fb4ca0f4d1b38fed3dcff2969d5b3bf05ea
parentfa263eeff79b1d80789a87a5af45ebe4c303025d (diff)
downloadPeerTube-31a911190b27d93f6324da3d826f96c7fbc5deb6.tar.gz
PeerTube-31a911190b27d93f6324da3d826f96c7fbc5deb6.tar.zst
PeerTube-31a911190b27d93f6324da3d826f96c7fbc5deb6.zip
Fix broadcast message log level
-rw-r--r--config/default.yaml4
-rw-r--r--config/production.yaml.example2
-rw-r--r--server/initializers/checker-after-init.ts2
-rw-r--r--server/tests/api/server/plugins.ts2
-rw-r--r--support/docker/production/config/production.yaml2
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
98log: 98log:
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:
474broadcast_message: 474broadcast_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
480search: 480search:
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
96log: 96log:
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 d75c0af04..911734fa0 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 3c09acc9a..6046ab97e 100644
--- a/server/tests/api/server/plugins.ts
+++ b/server/tests/api/server/plugins.ts
@@ -284,7 +284,7 @@ describe('Test plugins', function () {
284 }) 284 })
285 285
286 it('Should update the plugin and the theme', async function () { 286 it('Should update the plugin and the theme', async function () {
287 this.timeout(30000) 287 this.timeout(90000)
288 288
289 // Wait the scheduler that get the latest plugins versions 289 // Wait the scheduler that get the latest plugins versions
290 await wait(6000) 290 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
64log: 64log:
65 level: 'info' # debug/info/warn/error 65 level: 'info' # 'debug' | 'info' | 'warn' | 'error'
66 66
67tracker: 67tracker:
68 enabled: true 68 enabled: true