diff --git a/cmd/config.go b/cmd/config.go index 29feb30..19d6bba 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -62,8 +62,7 @@ type EnvironmentConfig struct { } type GlobalConfig struct { - LogLevel string `yaml:"logLevel"` - // Profile string `yaml:"profile"` + LogLevel string `yaml:"log_level"` } type FeatureConfig struct { @@ -233,7 +232,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig { return EnvironmentConfig{ Global: GlobalConfig{ LogLevel: "info", - // Profile: "default", }, Features: FeatureConfig{ BucketNotifications: BucketNotificationsFeatureConfig{ @@ -267,7 +265,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig { RepdAdmin: 4250, }, RaftSessions: 3, - // LogLevel: "info", Migration: &MigrationConfig{ Deploy: false, BasePorts: MdPortConfig{ @@ -288,7 +285,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig { RepdAdmin: 14250, }, RaftSessions: 1, - // LogLevel: "info", }, Utapi: UtapiConfig{}, MigrationTools: MigrationToolsConfig{}, diff --git a/templates/backbeat/config.json b/templates/backbeat/config.json index 48af427..7ee0675 100644 --- a/templates/backbeat/config.json +++ b/templates/backbeat/config.json @@ -216,7 +216,7 @@ } }, "log": { - "logLevel": "trace", + "logLevel": "{{ .Backbeat.LogLevel }}", "dumpLevel": "error" }, "metrics": { diff --git a/templates/cloudserver/config-v7.json b/templates/cloudserver/config-v7.json index 49493cd..306b974 100644 --- a/templates/cloudserver/config-v7.json +++ b/templates/cloudserver/config-v7.json @@ -53,7 +53,7 @@ }, "clusters": 1, "log": { - "logLevel": "info", + "logLevel": "{{ .Cloudserver.LogLevel }}", "dumpLevel": "error" }, "healthChecks": { diff --git a/templates/cloudserver/config-v9.json b/templates/cloudserver/config-v9.json index e469a7d..e2c042f 100644 --- a/templates/cloudserver/config-v9.json +++ b/templates/cloudserver/config-v9.json @@ -65,7 +65,7 @@ }, "clusters": 1, "log": { - "logLevel": "info", + "logLevel": "{{ .Cloudserver.LogLevel }}", "dumpLevel": "error" }, "healthChecks": { diff --git a/templates/scuba/config.json b/templates/scuba/config.json index ce2893b..3e1f3a4 100644 --- a/templates/scuba/config.json +++ b/templates/scuba/config.json @@ -1,7 +1,7 @@ { "env": "test", "log": { - "logLevel": "info", + "logLevel": "{{ .Scuba.LogLevel }}", "dumpLevel": "info" }, "retry": { diff --git a/templates/utapi/config.json b/templates/utapi/config.json index ff3431d..2b7f72f 100644 --- a/templates/utapi/config.json +++ b/templates/utapi/config.json @@ -5,7 +5,7 @@ "allowFrom": ["127.0.0.1/8", "::1"] }, "log": { - "logLevel": "info", + "logLevel": "{{ .Utapi.LogLevel }}", "dumpLevel": "error" }, "redis": { diff --git a/templates/vault/config.json b/templates/vault/config.json index fb32892..10976ac 100644 --- a/templates/vault/config.json +++ b/templates/vault/config.json @@ -50,7 +50,7 @@ "keyFilePath": "./tests/utils/keyfile", "adminCredentialsFilePath": "./tests/utils/admincredentials.json.encrypted", "log": { - "level": "info", + "level": "{{ .Vault.LogLevel }}", "dump": "error" }, "accountSeeds": [