From 0a4c2ee12cdd7807fe7600f397008fcd6d5b9233 Mon Sep 17 00:00:00 2001 From: arberkatellari Date: Tue, 29 Aug 2023 09:44:34 -0400 Subject: [PATCH] Add fatal logs on engine --- cmd/cgr-engine/cgr-engine.go | 23 ++++++++++------------- utils/consts.go | 1 + 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 36ba953c8..8ad6c14ba 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -316,12 +316,11 @@ func runPreload(loader *services.LoaderService, internalLoaderSChan chan rpcclie func main() { if err := cgrEngineFlags.Parse(os.Args[1:]); err != nil { - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } vers, err := utils.GetCGRVersion() if err != nil { - fmt.Println(err) - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } goVers := runtime.Version() if *version { @@ -361,7 +360,7 @@ func main() { cpuPath := path.Join(*cpuProfDir, utils.CpuPathCgr) cpuProfileFile, err = cores.StartCPUProfiling(cpuPath) if err != nil { - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } defer func() { if cS != nil { @@ -378,7 +377,7 @@ func main() { if *scheduledShutdown != utils.EmptyString { shutdownDur, err := utils.ParseDurationWithNanosecs(*scheduledShutdown) if err != nil { - log.Fatal(err) + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } shdWg.Add(1) go func() { // Schedule shutdown @@ -401,7 +400,7 @@ func main() { } if *checkConfig { if err := cfg.CheckConfigSanity(); err != nil { - fmt.Println(err) + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } return } @@ -524,13 +523,13 @@ func main() { gvService := services.NewGlobalVarS(cfg, srvDep) shdWg.Add(1) if err = gvService.Start(); err != nil { - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } dmService := services.NewDataDBService(cfg, connManager, srvDep) if dmService.ShouldRun() { // Some services can run without db, ie: ERs shdWg.Add(1) if err = dmService.Start(); err != nil { - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } } @@ -538,7 +537,7 @@ func main() { if storDBService.ShouldRun() { // Some services can run without db, ie: ERs shdWg.Add(1) if err = storDBService.Start(); err != nil { - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } } @@ -562,8 +561,7 @@ func main() { if anz.ShouldRun() { shdWg.Add(1) if err := anz.Start(); err != nil { - fmt.Println(err) - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } } @@ -572,8 +570,7 @@ func main() { coreS := services.NewCoreService(cfg, caps, server, internalCoreSv1Chan, anz, cpuProfileFile, memPrfDirForCores, shdWg, stopMemProf, shdChan, srvDep) shdWg.Add(1) if err := coreS.Start(); err != nil { - fmt.Println(err) - return + log.Fatalf("<%s> error received: <%s>, exiting!", utils.InitS, err.Error()) } cS = coreS.GetCoreS() diff --git a/utils/consts.go b/utils/consts.go index 4df6a5c15..109bf79f4 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -723,6 +723,7 @@ const ( MetaEventNumber = "*event_number" LoadIDs = "load_ids" DNSAgent = "DNSAgent" + InitS = "InitS" TLSNoCaps = "tls" UsageID = "UsageID" Replacement = "Replacement"