mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-23 08:08:45 +05:00
Move libcgr-engine into cgr-engine.go + flags refactor
This commit is contained in:
ionutboangiu
committed by
Dan Christian Bogos
Dan Christian Bogos
parent
ba9c2e1e3f
commit
3f0bb4df43
@@ -1,143 +0,0 @@
|
||||
/*
|
||||
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
|
||||
Copyright (C) ITsysCOM GmbH
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
|
||||
package services
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/cgrates/birpc/context"
|
||||
"github.com/cgrates/cgrates/config"
|
||||
"github.com/cgrates/cgrates/engine"
|
||||
"github.com/cgrates/cgrates/utils"
|
||||
)
|
||||
|
||||
func NewCGREngineFlags() *CGREngineFlags {
|
||||
fs := flag.NewFlagSet(utils.CgrEngine, flag.ExitOnError)
|
||||
return &CGREngineFlags{
|
||||
FlagSet: fs,
|
||||
CfgPath: fs.String(utils.CfgPathCgr, utils.ConfigPath, "Configuration directory path"),
|
||||
Version: fs.Bool(utils.VersionCgr, false, "Print application version and exit"),
|
||||
PidFile: fs.String(utils.PidCgr, utils.EmptyString, "Path to write the PID file"),
|
||||
CpuPrfDir: fs.String(utils.CpuProfDirCgr, utils.EmptyString, "Directory for CPU profiles"),
|
||||
MemPrfDir: fs.String(utils.MemProfDirCgr, utils.EmptyString, "Directory for memory profiles"),
|
||||
MemPrfInterval: fs.Duration(utils.MemProfIntervalCgr, 15*time.Second, "Interval between memory profile saves"),
|
||||
MemPrfMaxF: fs.Int(utils.MemProfMaxFilesCgr, 1, "Number of memory profiles to keep (most recent)"),
|
||||
MemPrfTS: fs.Bool(utils.MemProfTimestampCgr, false, "Add timestamp to memory profile files"),
|
||||
ScheduledShutdown: fs.String(utils.ScheduledShutdownCgr, utils.EmptyString, "Shutdown the engine after the specified duration"),
|
||||
SingleCPU: fs.Bool(utils.SingleCpuCgr, false, "Run on a single CPU core"),
|
||||
Logger: fs.String(utils.LoggerCfg, utils.EmptyString, "Logger type <*syslog|*stdout|*kafkaLog>"),
|
||||
NodeID: fs.String(utils.NodeIDCfg, utils.EmptyString, "Node ID of the engine"),
|
||||
LogLevel: fs.Int(utils.LogLevelCfg, -1, "Log level (0=emergency to 7=debug)"),
|
||||
Preload: fs.String(utils.PreloadCgr, utils.EmptyString, "Loader IDs used to load data before engine starts"),
|
||||
CheckConfig: fs.Bool(utils.CheckCfgCgr, false, "Verify the config without starting the engine"),
|
||||
SetVersions: fs.Bool(utils.SetVersionsCgr, false, "Overwrite database versions (equivalent to cgr-migrator -exec=*set_versions)"),
|
||||
}
|
||||
}
|
||||
|
||||
type CGREngineFlags struct {
|
||||
*flag.FlagSet
|
||||
|
||||
CfgPath *string
|
||||
Version *bool
|
||||
PidFile *string
|
||||
CpuPrfDir *string
|
||||
MemPrfDir *string
|
||||
MemPrfInterval *time.Duration
|
||||
MemPrfMaxF *int
|
||||
MemPrfTS *bool
|
||||
ScheduledShutdown *string
|
||||
SingleCPU *bool
|
||||
Logger *string
|
||||
NodeID *string
|
||||
LogLevel *int
|
||||
Preload *string
|
||||
CheckConfig *bool
|
||||
SetVersions *bool
|
||||
}
|
||||
|
||||
func CgrWritePid(pidFile string) (err error) {
|
||||
var f *os.File
|
||||
if f, err = os.Create(pidFile); err != nil {
|
||||
err = fmt.Errorf("could not create pid file: %s", err)
|
||||
return
|
||||
}
|
||||
if _, err = f.WriteString(strconv.Itoa(os.Getpid())); err != nil {
|
||||
f.Close()
|
||||
err = fmt.Errorf("could not write pid file: %s", err)
|
||||
return
|
||||
}
|
||||
if err = f.Close(); err != nil {
|
||||
err = fmt.Errorf("could not close pid file: %s", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func waitForFilterS(ctx *context.Context, fsCh chan *engine.FilterS) (filterS *engine.FilterS, err error) {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
err = ctx.Err()
|
||||
case filterS = <-fsCh:
|
||||
fsCh <- filterS
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func InitConfigFromPath(ctx *context.Context, path, nodeID, logType string, logLevel int) (cfg *config.CGRConfig, err error) {
|
||||
// Init config
|
||||
if cfg, err = config.NewCGRConfigFromPath(ctx, path); err != nil {
|
||||
err = fmt.Errorf("could not parse config: <%s>", err)
|
||||
return
|
||||
}
|
||||
if cfg.ConfigDBCfg().Type != utils.MetaInternal {
|
||||
var d config.ConfigDB
|
||||
if d, err = engine.NewDataDBConn(cfg.ConfigDBCfg().Type,
|
||||
cfg.ConfigDBCfg().Host, cfg.ConfigDBCfg().Port,
|
||||
cfg.ConfigDBCfg().Name, cfg.ConfigDBCfg().User,
|
||||
cfg.ConfigDBCfg().Password, cfg.GeneralCfg().DBDataEncoding,
|
||||
cfg.ConfigDBCfg().Opts, nil); err != nil { // Cannot configure getter database, show stopper
|
||||
err = fmt.Errorf("could not configure configDB: <%s>", err)
|
||||
return
|
||||
}
|
||||
if err = cfg.LoadFromDB(ctx, d); err != nil {
|
||||
err = fmt.Errorf("could not parse config from DB: <%s>", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
if nodeID != utils.EmptyString {
|
||||
cfg.GeneralCfg().NodeID = nodeID
|
||||
}
|
||||
if logLevel != -1 { // Modify the log level if provided by command arguments
|
||||
cfg.LoggerCfg().Level = logLevel
|
||||
}
|
||||
if logType != utils.EmptyString {
|
||||
cfg.LoggerCfg().Type = logType
|
||||
}
|
||||
if utils.ConcurrentReqsLimit != 0 { // used as shared variable
|
||||
cfg.CoreSCfg().Caps = utils.ConcurrentReqsLimit
|
||||
}
|
||||
if len(utils.ConcurrentReqsStrategy) != 0 {
|
||||
cfg.CoreSCfg().CapsStrategy = utils.ConcurrentReqsStrategy
|
||||
}
|
||||
config.SetCgrConfig(cfg) // Share the config object
|
||||
return
|
||||
}
|
||||
@@ -1,168 +0,0 @@
|
||||
/*
|
||||
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
|
||||
Copyright (C) ITsysCOM GmbH
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
|
||||
package services
|
||||
|
||||
// import (
|
||||
// "path"
|
||||
// "reflect"
|
||||
// "testing"
|
||||
// "time"
|
||||
// )
|
||||
//
|
||||
// // If any flag changes, this test should fail.
|
||||
// // Do not use constants in this test to ensure these changes are detected.
|
||||
// func TestCgrEngineFlags(t *testing.T) {
|
||||
// ngFlags := NewCGREngineFlags()
|
||||
// tests := []struct {
|
||||
// name string
|
||||
// flags []string
|
||||
// flagVar any
|
||||
// defaultVal any
|
||||
// want any
|
||||
// }{
|
||||
// {
|
||||
// name: "cfgPath",
|
||||
// flags: []string{"-config_path", path.Join("/usr", "share", "cgrates", "conf", "samples", "tutorial")},
|
||||
// flagVar: ngFlags.CfgPath,
|
||||
// defaultVal: "/etc/cgrates/",
|
||||
// want: "/usr/share/cgrates/conf/samples/tutorial",
|
||||
// },
|
||||
// {
|
||||
// name: "version",
|
||||
// flags: []string{"-version"},
|
||||
// flagVar: ngFlags.Version,
|
||||
// defaultVal: false,
|
||||
// want: true,
|
||||
// },
|
||||
// {
|
||||
// name: "pidFile",
|
||||
// flags: []string{"-pid", "/run/cgrates/cgrates.pid"},
|
||||
// flagVar: ngFlags.PidFile,
|
||||
// defaultVal: "",
|
||||
// want: "/run/cgrates/cgrates.pid",
|
||||
// },
|
||||
// {
|
||||
// name: "cpuProfDir",
|
||||
// flags: []string{"-cpuprof_dir", "/tmp/profiling"},
|
||||
// flagVar: ngFlags.CpuPrfDir,
|
||||
// defaultVal: "",
|
||||
// want: "/tmp/profiling",
|
||||
// },
|
||||
// {
|
||||
// name: "memProfDir",
|
||||
// flags: []string{"-memprof_dir", "/tmp/profiling"},
|
||||
// flagVar: ngFlags.MemPrfDir,
|
||||
// defaultVal: "",
|
||||
// want: "/tmp/profiling",
|
||||
// },
|
||||
// {
|
||||
// name: "memProfInterval",
|
||||
// flags: []string{"-memprof_interval", "1s"},
|
||||
// flagVar: ngFlags.MemPrfInterval,
|
||||
// defaultVal: 15 * time.Second,
|
||||
// want: time.Second,
|
||||
// },
|
||||
// {
|
||||
// name: "memProfMaxFiles",
|
||||
// flags: []string{"-memprof_maxfiles", "3"},
|
||||
// flagVar: ngFlags.MemPrfMaxF,
|
||||
// defaultVal: 1,
|
||||
// want: 3,
|
||||
// },
|
||||
// {
|
||||
// name: "memProfTimestamp",
|
||||
// flags: []string{"-memprof_timestamp"},
|
||||
// flagVar: ngFlags.MemPrfTS,
|
||||
// defaultVal: false,
|
||||
// want: true,
|
||||
// },
|
||||
// {
|
||||
// name: "scheduledShutdown",
|
||||
// flags: []string{"-scheduled_shutdown", "1h"},
|
||||
// flagVar: ngFlags.ScheduledShutdown,
|
||||
// defaultVal: "",
|
||||
// want: "1h",
|
||||
// },
|
||||
// {
|
||||
// name: "singleCPU",
|
||||
// flags: []string{"-single_cpu"},
|
||||
// flagVar: ngFlags.SingleCPU,
|
||||
// defaultVal: false,
|
||||
// want: true,
|
||||
// },
|
||||
// {
|
||||
// name: "syslogger",
|
||||
// flags: []string{"-logger", "*stdout"},
|
||||
// flagVar: ngFlags.Logger,
|
||||
// defaultVal: "",
|
||||
// want: "*stdout",
|
||||
// },
|
||||
// {
|
||||
// name: "nodeID",
|
||||
// flags: []string{"-node_id", "CGRateS.org"},
|
||||
// flagVar: ngFlags.NodeID,
|
||||
// defaultVal: "",
|
||||
// want: "CGRateS.org",
|
||||
// },
|
||||
// {
|
||||
// name: "logLevel",
|
||||
// flags: []string{"-log_level", "7"},
|
||||
// flagVar: ngFlags.LogLevel,
|
||||
// defaultVal: -1,
|
||||
// want: 7,
|
||||
// },
|
||||
// {
|
||||
// name: "preload",
|
||||
// flags: []string{"-preload", "TestPreloadID"},
|
||||
// flagVar: ngFlags.Preload,
|
||||
// defaultVal: "",
|
||||
// want: "TestPreloadID",
|
||||
// },
|
||||
// {
|
||||
// name: "check_config",
|
||||
// flags: []string{"-check_config", "true"},
|
||||
// flagVar: ngFlags.CheckConfig,
|
||||
// defaultVal: false,
|
||||
// want: true,
|
||||
// },
|
||||
// {
|
||||
// name: "setVersions",
|
||||
// flags: []string{"-set_versions"},
|
||||
// flagVar: ngFlags.SetVersions,
|
||||
// defaultVal: false,
|
||||
// want: true,
|
||||
// },
|
||||
// }
|
||||
//
|
||||
// for _, tt := range tests {
|
||||
// t.Run(tt.name, func(t *testing.T) {
|
||||
// flagVal := reflect.ValueOf(tt.flagVar).Elem().Interface()
|
||||
// if flagVal != tt.defaultVal {
|
||||
// t.Errorf("%s=%v, want default value %v", tt.name, flagVal, tt.defaultVal)
|
||||
// }
|
||||
// if err := ngFlags.Parse(tt.flags); err != nil {
|
||||
// t.Errorf("cgrEngineFlags.Parse(%v) returned unexpected error: %v", tt.flags, err)
|
||||
// }
|
||||
// flagVal = reflect.ValueOf(tt.flagVar).Elem().Interface()
|
||||
// if flagVal != tt.want {
|
||||
// t.Errorf("%s=%v, want %v", tt.name, flagVal, tt.want)
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
@@ -20,7 +20,6 @@ package services
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/cgrates/birpc/context"
|
||||
@@ -33,11 +32,11 @@ import (
|
||||
)
|
||||
|
||||
// NewLoaderService returns the Loader Service
|
||||
func NewLoaderService(cfg *config.CGRConfig, preloadIDs string) *LoaderService {
|
||||
func NewLoaderService(cfg *config.CGRConfig, preloadIDs []string) *LoaderService {
|
||||
return &LoaderService{
|
||||
cfg: cfg,
|
||||
stopChan: make(chan struct{}),
|
||||
preloadIDs: strings.Split(preloadIDs, utils.FieldsSep),
|
||||
preloadIDs: preloadIDs,
|
||||
stateDeps: NewStateDependencies([]string{utils.StateServiceUP, utils.StateServiceDOWN}),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user