Skip to content

Commit 2f07e8d

Browse files
authored
Merge pull request #58 from scality/improvement/WKBCH-17/implement_log_level_for_remaining
impr(WKBCH-17): Implement global log level for remaining components
2 parents ba13e48 + e352404 commit 2f07e8d

File tree

7 files changed

+7
-11
lines changed

7 files changed

+7
-11
lines changed

cmd/config.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ type EnvironmentConfig struct {
6262
}
6363

6464
type GlobalConfig struct {
65-
LogLevel string `yaml:"logLevel"`
66-
// Profile string `yaml:"profile"`
65+
LogLevel string `yaml:"log_level"`
6766
}
6867

6968
type FeatureConfig struct {
@@ -233,7 +232,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
233232
return EnvironmentConfig{
234233
Global: GlobalConfig{
235234
LogLevel: "info",
236-
// Profile: "default",
237235
},
238236
Features: FeatureConfig{
239237
BucketNotifications: BucketNotificationsFeatureConfig{
@@ -267,7 +265,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
267265
RepdAdmin: 4250,
268266
},
269267
RaftSessions: 3,
270-
// LogLevel: "info",
271268
Migration: &MigrationConfig{
272269
Deploy: false,
273270
BasePorts: MdPortConfig{
@@ -288,7 +285,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
288285
RepdAdmin: 14250,
289286
},
290287
RaftSessions: 1,
291-
// LogLevel: "info",
292288
},
293289
Utapi: UtapiConfig{},
294290
MigrationTools: MigrationToolsConfig{},

templates/backbeat/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
}
217217
},
218218
"log": {
219-
"logLevel": "trace",
219+
"logLevel": "{{ .Backbeat.LogLevel }}",
220220
"dumpLevel": "error"
221221
},
222222
"metrics": {

templates/cloudserver/config-v7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
},
5454
"clusters": 1,
5555
"log": {
56-
"logLevel": "info",
56+
"logLevel": "{{ .Cloudserver.LogLevel }}",
5757
"dumpLevel": "error"
5858
},
5959
"healthChecks": {

templates/cloudserver/config-v9.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
},
6666
"clusters": 1,
6767
"log": {
68-
"logLevel": "info",
68+
"logLevel": "{{ .Cloudserver.LogLevel }}",
6969
"dumpLevel": "error"
7070
},
7171
"healthChecks": {

templates/scuba/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"env": "test",
33
"log": {
4-
"logLevel": "info",
4+
"logLevel": "{{ .Scuba.LogLevel }}",
55
"dumpLevel": "info"
66
},
77
"retry": {

templates/utapi/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"allowFrom": ["127.0.0.1/8", "::1"]
66
},
77
"log": {
8-
"logLevel": "info",
8+
"logLevel": "{{ .Utapi.LogLevel }}",
99
"dumpLevel": "error"
1010
},
1111
"redis": {

templates/vault/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"keyFilePath": "./tests/utils/keyfile",
5151
"adminCredentialsFilePath": "./tests/utils/admincredentials.json.encrypted",
5252
"log": {
53-
"level": "info",
53+
"level": "{{ .Vault.LogLevel }}",
5454
"dump": "error"
5555
},
5656
"accountSeeds": [

0 commit comments

Comments
 (0)