diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 4dac7c717..31aeabdce 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -53,7 +53,7 @@ var ( cgrEngineFlags = flag.NewFlagSet(utils.CgrEngine, flag.ContinueOnError) cfgPath = cgrEngineFlags.String(utils.CfgPathCgr, utils.ConfigPath, "Configuration directory path.") version = cgrEngineFlags.Bool(utils.VersionCgr, false, "Prints the application version.") - checkConfig = cgrEngineFlags.Bool(utils.CheckCfgCgr, false, "Verify the config without starting the engine") + printConfig = cgrEngineFlags.Bool(utils.PrintCfgCgr, false, "Print the configuration object in JSON format") pidFile = cgrEngineFlags.String(utils.PidCgr, utils.EmptyString, "Write pid file") httpPprofPath = cgrEngineFlags.String(utils.HttpPrfPthCgr, utils.EmptyString, "http address used for program profiling") cpuProfDir = cgrEngineFlags.String(utils.CpuProfDirCgr, utils.EmptyString, "write cpu profile to files") @@ -414,12 +414,6 @@ func main() { log.Fatalf("Could not parse config: <%s>", err.Error()) return } - if *checkConfig { - if err := cfg.CheckConfigSanity(); err != nil { - log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) - } - return - } if *nodeID != utils.EmptyString { cfg.GeneralCfg().NodeID = *nodeID @@ -439,6 +433,11 @@ func main() { } utils.Logger.SetLogLevel(lgLevel) + if *printConfig { + cfgJSON := utils.ToIJSON(cfg.AsMapInterface(cfg.GeneralCfg().RSRSep)) + utils.Logger.Info(fmt.Sprintf("Configuration loaded from %s:\n%s", *cfgPath, cfgJSON)) + } + // init the concurrentRequests caps := engine.NewCaps(cfg.CoreSCfg().Caps, cfg.CoreSCfg().CapsStrategy) utils.Logger.Info(fmt.Sprintf(" starting version <%s><%s>", vers, goVers)) diff --git a/cmd/cgr-engine/cgr-engine_flags_test.go b/cmd/cgr-engine/cgr-engine_flags_test.go index 71c6734b6..56fae4800 100644 --- a/cmd/cgr-engine/cgr-engine_flags_test.go +++ b/cmd/cgr-engine/cgr-engine_flags_test.go @@ -39,10 +39,10 @@ func TestCgrEngineFlags(t *testing.T) { t.Errorf("Expected true, received %+v", *version) } - if err := cgrEngineFlags.Parse([]string{"-check_config", "true"}); err != nil { + if err := cgrEngineFlags.Parse([]string{"-print_config", "true"}); err != nil { t.Fatal(err) - } else if *checkConfig != true { - t.Errorf("Expected true, received %+v", *checkConfig) + } else if *printConfig != true { + t.Errorf("Expected true, received %+v", *printConfig) } if err := cgrEngineFlags.Parse([]string{"-pid", "usr/share/cgrates/cgrates.json"}); err != nil { diff --git a/utils/consts.go b/utils/consts.go index 5a30f67a6..082f92ba0 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -2810,7 +2810,7 @@ const ( SepCgr = " " //Cgr engine CgrEngine = "cgr-engine" - CheckCfgCgr = "check_config" + PrintCfgCgr = "print_config" PidCgr = "pid" HttpPrfPthCgr = "httprof_path" CpuProfDirCgr = "cpuprof_dir"