OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix logger warning level

pull/4107/head
Chocobozzz 2021-05-14 14:17:53 +02:00
parent db0159c7f2
commit cb4bab61c1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
View File

@ -100,7 +100,7 @@
<div class="peertube-select-container">
<select id="broadcastMessageLevel" formControlName="level" class="form-control">
<option value="info">info</option>
<option value="warning">warning</option>
<option value="warn">warning</option>
<option value="error">error</option>
</select>
</div>

1
client/src/sass/player/context-menu.scss
View File

@ -12,6 +12,7 @@ $context-menu-width: 350px;
padding: 8px 0;
border-radius: 4px;
width: $context-menu-width;
z-index: 105; // On top of the progress bar
.vjs-menu-content {
opacity: $primary-foreground-opacity;

2
config/default.yaml
View File

@ -474,7 +474,7 @@ theme:
broadcast_message:
enabled: false
message: '' # Support markdown
level: 'info' # 'info' | 'warning' | 'error'
level: 'info' # 'info' | 'warn' | 'error'
dismissable: false
search:

2
scripts/e2e/index.sh
View File

@ -11,4 +11,4 @@ npm run clean:server:test
npm run concurrently -- -k -s first \
"cd client && npm run ng -- e2e --port 3333" \
"NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server"
"NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server"

2
scripts/e2e/local.sh
View File

@ -12,4 +12,4 @@ npm run clean:server:test
npm run concurrently -- -k -s first \
"cd client && npm run ng -- e2e --port 3333 -c local" \
"NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server"
"NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server"

2
server/initializers/checker-after-init.ts
View File

@ -132,7 +132,7 @@ function checkConfig () {
// Broadcast message
if (CONFIG.BROADCAST_MESSAGE.ENABLED) {
const currentLevel = CONFIG.BROADCAST_MESSAGE.LEVEL
const available = [ 'info', 'warning', 'error' ]
const available = [ 'info', 'warn', 'error' ]
if (available.includes(currentLevel) === false) {
return 'Broadcast message level should be ' + available.join(' or ') + ' instead of ' + currentLevel

2
support/docker/production/config/production.yaml
View File

@ -62,7 +62,7 @@ storage:
client_overrides: '../data/client-overrides/'
log:
level: 'info' # debug/info/warning/error
level: 'info' # debug/info/warn/error
tracker:
enabled: true