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: client_overrides: 'storage/client-overrides/' log: - level: 'info' # debug/info/warning/error + level: 'info' # 'debug' | 'info' | 'warn' | 'error' rotation: enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate maxFileSize: 12MB @@ -474,7 +474,7 @@ theme: broadcast_message: enabled: false message: '' # Support markdown - level: 'info' # 'info' | 'warn' | 'error' + level: 'info' # 'info' | 'warning' | 'error' dismissable: false 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: client_overrides: '/var/www/peertube/storage/client-overrides/' log: - level: 'info' # debug/info/warning/error + level: 'info' # 'debug' | 'info' | 'warn' | 'error' rotation: enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate 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 () { // Broadcast message if (CONFIG.BROADCAST_MESSAGE.ENABLED) { const currentLevel = CONFIG.BROADCAST_MESSAGE.LEVEL - const available = [ 'info', 'warn', 'error' ] + const available = [ 'info', 'warning', 'error' ] if (available.includes(currentLevel) === false) { 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 () { }) it('Should update the plugin and the theme', async function () { - this.timeout(30000) + this.timeout(90000) // Wait the scheduler that get the latest plugins versions 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: client_overrides: '../data/client-overrides/' log: - level: 'info' # debug/info/warn/error + level: 'info' # 'debug' | 'info' | 'warn' | 'error' tracker: enabled: true