uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 10:06:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add engine flag to print the config object in JSON format

Browse Source 
Removed the redundant check_config engine flag. Config sanity was
checked by the NewCGRConfigFromPath function.
This commit is contained in:
ionutboangiu
2024-06-11 19:09:48 +03:00
committed by Dan Christian Bogos
parent 8103cd4c9f
commit d31b4d0984
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/cgr-engine/cgr-engine.go
View File

@@ -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("<CoreS> starting version <%s><%s>", vers, goVers))

6
cmd/cgr-engine/cgr-engine_flags_test.go
View File

@@ -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 {