diff options
Diffstat (limited to 'utils/runtime_config.go')
| -rw-r--r-- | utils/runtime_config.go | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/utils/runtime_config.go b/utils/runtime_config.go index 42170f6..fb5bd72 100644 --- a/utils/runtime_config.go +++ b/utils/runtime_config.go @@ -12,7 +12,6 @@ import ( type RuntimeConfig struct { Path string - Debug bool Http HttpConfig `json:"http"` Database DatabaseConfig `json:"database"` } @@ -29,7 +28,7 @@ type DatabaseConfig struct { Socket string `json:"socket"` User string `json:"user"` Database string `json:"database"` - Debug bool + Migrations string `json:"migrations"` } func GetRuntimeConfig() RuntimeConfig { @@ -39,7 +38,6 @@ func GetRuntimeConfig() RuntimeConfig { // read command line flags flag.StringVar(&config.Path, "c", "/etc/ceres/config.json", "Path to ceres configuration file") - flag.BoolVar(&config.Debug, "d", false, "Use this flag if you are in a development environment") flag.Parse() // open config file @@ -55,30 +53,13 @@ func GetRuntimeConfig() RuntimeConfig { log.Fatalf("Could not read configuration file %s", config.Path) } + fmt.Print("Used config: " + string(configData) + "\n") + // parse content to config structs err = json.Unmarshal(configData, &config) if err != nil { log.Fatalf("Could not parse configuration file %s", config.Path) } - // override defaults if in debugging mode - if config.Debug { - config.Http.Static = "./data/static" - config.Http.Templates = "./data/templates" - config.Http.Storage = "./data/storage" - } - - // copy debug value - config.Database.Debug = config.Debug - - // print config if in debug mode - if config.Debug { - configuration,err := json.MarshalIndent(config, "", " ") - if err != nil { - log.Fatal(err) - } - fmt.Print("Used config: " + string(configuration) + "\n") - } - return config } |