Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -233,7 +232,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
return EnvironmentConfig{
Global: GlobalConfig{
LogLevel: "info",
// Profile: "default",
},
Features: FeatureConfig{
BucketNotifications: BucketNotificationsFeatureConfig{
Expand Down Expand Up @@ -267,7 +265,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
RepdAdmin: 4250,
},
RaftSessions: 3,
// LogLevel: "info",
Migration: &MigrationConfig{
Deploy: false,
BasePorts: MdPortConfig{
Expand All @@ -288,7 +285,6 @@ func DefaultEnvironmentConfig() EnvironmentConfig {
RepdAdmin: 14250,
},
RaftSessions: 1,
// LogLevel: "info",
},
Utapi: UtapiConfig{},
MigrationTools: MigrationToolsConfig{},
Expand Down
2 changes: 1 addition & 1 deletion templates/backbeat/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
}
},
"log": {
"logLevel": "trace",
"logLevel": "{{ .Backbeat.LogLevel }}",
"dumpLevel": "error"
},
"metrics": {
Expand Down
2 changes: 1 addition & 1 deletion templates/cloudserver/config-v7.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"clusters": 1,
"log": {
"logLevel": "info",
"logLevel": "{{ .Cloudserver.LogLevel }}",
"dumpLevel": "error"
},
"healthChecks": {
Expand Down
2 changes: 1 addition & 1 deletion templates/cloudserver/config-v9.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"clusters": 1,
"log": {
"logLevel": "info",
"logLevel": "{{ .Cloudserver.LogLevel }}",
"dumpLevel": "error"
},
"healthChecks": {
Expand Down
2 changes: 1 addition & 1 deletion templates/scuba/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"env": "test",
"log": {
"logLevel": "info",
"logLevel": "{{ .Scuba.LogLevel }}",
"dumpLevel": "info"
},
"retry": {
Expand Down
2 changes: 1 addition & 1 deletion templates/utapi/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"allowFrom": ["127.0.0.1/8", "::1"]
},
"log": {
"logLevel": "info",
"logLevel": "{{ .Utapi.LogLevel }}",
"dumpLevel": "error"
},
"redis": {
Expand Down
2 changes: 1 addition & 1 deletion templates/vault/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"keyFilePath": "./tests/utils/keyfile",
"adminCredentialsFilePath": "./tests/utils/admincredentials.json.encrypted",
"log": {
"level": "info",
"level": "{{ .Vault.LogLevel }}",
"dump": "error"
},
"accountSeeds": [
Expand Down
Loading