aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-14 14:17:53 +0200
committerChocobozzz <me@florianbigard.com>2021-05-14 14:17:53 +0200
commitcb4bab61c19f2be7858f9cc6e8e234f04b1d504f (patch)
tree0fe772bd879c52b587cfc8a0333bea5301cbfea1
parentdb0159c7f20633f9b472b77f5798849fdbdbe4b8 (diff)
downloadPeerTube-cb4bab61c19f2be7858f9cc6e8e234f04b1d504f.tar.gz
PeerTube-cb4bab61c19f2be7858f9cc6e8e234f04b1d504f.tar.zst
PeerTube-cb4bab61c19f2be7858f9cc6e8e234f04b1d504f.zip
Fix logger warning level
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html2
-rw-r--r--client/src/sass/player/context-menu.scss1
-rw-r--r--config/default.yaml2
-rwxr-xr-xscripts/e2e/index.sh2
-rwxr-xr-xscripts/e2e/local.sh2
-rw-r--r--server/initializers/checker-after-init.ts2
-rw-r--r--support/docker/production/config/production.yaml2
7 files changed, 7 insertions, 6 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index 84a793ae4..b7fac176d 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -100,7 +100,7 @@
100 <div class="peertube-select-container"> 100 <div class="peertube-select-container">
101 <select id="broadcastMessageLevel" formControlName="level" class="form-control"> 101 <select id="broadcastMessageLevel" formControlName="level" class="form-control">
102 <option value="info">info</option> 102 <option value="info">info</option>
103 <option value="warning">warning</option> 103 <option value="warn">warning</option>
104 <option value="error">error</option> 104 <option value="error">error</option>
105 </select> 105 </select>
106 </div> 106 </div>
diff --git a/client/src/sass/player/context-menu.scss b/client/src/sass/player/context-menu.scss
index 1738f486d..1653dd2c4 100644
--- a/client/src/sass/player/context-menu.scss
+++ b/client/src/sass/player/context-menu.scss
@@ -12,6 +12,7 @@ $context-menu-width: 350px;
12 padding: 8px 0; 12 padding: 8px 0;
13 border-radius: 4px; 13 border-radius: 4px;
14 width: $context-menu-width; 14 width: $context-menu-width;
15 z-index: 105; // On top of the progress bar
15 16
16 .vjs-menu-content { 17 .vjs-menu-content {
17 opacity: $primary-foreground-opacity; 18 opacity: $primary-foreground-opacity;
diff --git a/config/default.yaml b/config/default.yaml
index 281cc0577..370a77925 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -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' | 'warning' | 'error' 477 level: 'info' # 'info' | 'warn' | 'error'
478 dismissable: false 478 dismissable: false
479 479
480search: 480search:
diff --git a/scripts/e2e/index.sh b/scripts/e2e/index.sh
index 08f09c9ed..49d57f1df 100755
--- a/scripts/e2e/index.sh
+++ b/scripts/e2e/index.sh
@@ -11,4 +11,4 @@ npm run clean:server:test
11 11
12npm run concurrently -- -k -s first \ 12npm run concurrently -- -k -s first \
13 "cd client && npm run ng -- e2e --port 3333" \ 13 "cd client && npm run ng -- e2e --port 3333" \
14 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" 14 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server"
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh
index 0e74707d8..469f2eb5e 100755
--- a/scripts/e2e/local.sh
+++ b/scripts/e2e/local.sh
@@ -12,4 +12,4 @@ npm run clean:server:test
12 12
13npm run concurrently -- -k -s first \ 13npm run concurrently -- -k -s first \
14 "cd client && npm run ng -- e2e --port 3333 -c local" \ 14 "cd client && npm run ng -- e2e --port 3333 -c local" \
15 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" 15 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server"
diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index a93c8b7fd..5fd1af82f 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', 'warning', 'error' ] 135 const available = [ 'info', 'warn', '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/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index c97c37987..688f88edd 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/warning/error 65 level: 'info' # debug/info/warn/error
66 66
67tracker: 67tracker:
68 enabled: true 68 enabled: true