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

Simplify running of the engine via only one Run command

Browse Source
This commit is contained in:
DanB
2024-11-26 12:50:08 +01:00
parent 3b195dcf1d
commit 76398441da
2 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ import (
"github.com/cgrates/cgrates/utils"
)
func RunCGREngine(fs []string) (err error) {
func runCGREngine(fs []string) (err error) {
flags := services.NewCGREngineFlags()
flags.Parse(fs)
var vers string
@@ -60,10 +60,7 @@ func RunCGREngine(fs []string) (err error) {
cgr := services.NewCGREngine(cfg)
defer cgr.Stop(*flags.PidFile)
if err = cgr.Init(ctx, cancel, flags, vers); err != nil {
return
}
if err = cgr.StartServices(ctx, cancel, *flags.Preload,
if err = cgr.Run(ctx, cancel, flags, vers,
cores.MemoryProfilingParams{
DirPath: *flags.MemPrfDir,
MaxFiles: *flags.MemPrfMaxF,
@@ -72,12 +69,13 @@ func RunCGREngine(fs []string) (err error) {
}); err != nil {
return
}
<-ctx.Done()
return
}
func main() {
if err := RunCGREngine(os.Args[1:]); err != nil {
if err := runCGREngine(os.Args[1:]); err != nil {
log.Fatal(err)
}
}

97
services/cgr-engine.go
View File

@@ -264,7 +264,54 @@ func (cgr *CGREngine) InitServices(setVersions bool) {
}
func (cgr *CGREngine) StartServices(ctx *context.Context, shtDw context.CancelFunc, preload string, memProfParams cores.MemoryProfilingParams) (err error) {
// init will initialize the signal handlers and other functions needed by CGRateS service to run
func (cgr *CGREngine) init(ctx *context.Context, shtDw context.CancelFunc, flags *CGREngineFlags, vers string) (err error) {
cgr.shdWg.Add(1)
go cgrSingnalHandler(ctx, shtDw, cgr.cfg, cgr.shdWg)
var cpuPrfF *os.File
if *flags.CpuPrfDir != utils.EmptyString {
cpuPath := filepath.Join(*flags.CpuPrfDir, utils.CpuPathCgr)
if cpuPrfF, err = cores.StartCPUProfiling(cpuPath); err != nil {
return
}
cgr.cpuPrfF = cpuPrfF
}
if *flags.ScheduledShutdown != utils.EmptyString {
var shtDwDur time.Duration
if shtDwDur, err = utils.ParseDurationWithNanosecs(*flags.ScheduledShutdown); err != nil {
return
}
cgr.shdWg.Add(1)
go func() { // Schedule shutdown
tm := time.NewTimer(shtDwDur)
select {
case <-tm.C:
shtDw()
case <-ctx.Done():
tm.Stop()
}
cgr.shdWg.Done()
}()
}
// init syslog
if utils.Logger, err = engine.NewLogger(ctx,
utils.FirstNonEmpty(*flags.Logger, cgr.cfg.LoggerCfg().Type),
cgr.cfg.GeneralCfg().DefaultTenant,
cgr.cfg.GeneralCfg().NodeID,
cgr.cM, cgr.cfg); err != nil {
return fmt.Errorf("Could not initialize syslog connection, err: <%s>", err)
}
efs.SetFailedPostCacheTTL(cgr.cfg.EFsCfg().FailedPostsTTL) // init failedPosts to posts loggers/exporters in case of failing
utils.Logger.Info(fmt.Sprintf("<CoreS> starting version <%s><%s>", vers, runtime.Version()))
cgr.InitServices(*flags.SetVersions)
return nil
}
// startServices will start the services infrastructure
func (cgr *CGREngine) startServices(ctx *context.Context, shtDw context.CancelFunc, preload string, memProfParams cores.MemoryProfilingParams) (err error) {
defer func() {
if err != nil {
cgr.srvManager.ShutdownServices()
@@ -350,49 +397,13 @@ func (cgr *CGREngine) StartServices(ctx *context.Context, shtDw context.CancelFu
return
}
func (cgr *CGREngine) Init(ctx *context.Context, shtDw context.CancelFunc, flags *CGREngineFlags, vers string) (err error) {
cgr.shdWg.Add(1)
go cgrSingnalHandler(ctx, shtDw, cgr.cfg, cgr.shdWg)
var cpuPrfF *os.File
if *flags.CpuPrfDir != utils.EmptyString {
cpuPath := filepath.Join(*flags.CpuPrfDir, utils.CpuPathCgr)
if cpuPrfF, err = cores.StartCPUProfiling(cpuPath); err != nil {
return
}
cgr.cpuPrfF = cpuPrfF
// Run will run the CGREngine, calling it's init and startServices
func (cgr *CGREngine) Run(ctx *context.Context, shtDw context.CancelFunc,
flags *CGREngineFlags, vers string, memProfParams cores.MemoryProfilingParams) (err error) {
if err = cgr.init(ctx, shtDw, flags, vers); err != nil {
return
}
if *flags.ScheduledShutdown != utils.EmptyString {
var shtDwDur time.Duration
if shtDwDur, err = utils.ParseDurationWithNanosecs(*flags.ScheduledShutdown); err != nil {
return
}
cgr.shdWg.Add(1)
go func() { // Schedule shutdown
tm := time.NewTimer(shtDwDur)
select {
case <-tm.C:
shtDw()
case <-ctx.Done():
tm.Stop()
}
cgr.shdWg.Done()
}()
}
// init syslog
if utils.Logger, err = engine.NewLogger(ctx,
utils.FirstNonEmpty(*flags.Logger, cgr.cfg.LoggerCfg().Type),
cgr.cfg.GeneralCfg().DefaultTenant,
cgr.cfg.GeneralCfg().NodeID,
cgr.cM, cgr.cfg); err != nil {
return fmt.Errorf("Could not initialize syslog connection, err: <%s>", err)
}
efs.SetFailedPostCacheTTL(cgr.cfg.EFsCfg().FailedPostsTTL) // init failedPosts to posts loggers/exporters in case of failing
utils.Logger.Info(fmt.Sprintf("<CoreS> starting version <%s><%s>", vers, runtime.Version()))
cgr.InitServices(*flags.SetVersions)
return nil
return cgr.startServices(ctx, shtDw, *flags.Preload, memProfParams)
}
func (cgr *CGREngine) Stop(pidFile string) {