From 65ce36fbe1ca2a0f58c9c1996edc608361204b71 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 7 Dec 2020 12:13:41 +0200 Subject: [PATCH] Updated NewLogger function --- cmd/cgr-engine/cgr-engine.go | 2 +- engine/z_poster_it_test.go | 6 ++-- ers/amqp_it_test.go | 2 +- ers/amqpv1_it_test.go | 2 +- ers/sql_it_test.go | 2 +- services/apiers_it_test.go | 2 +- services/asteriskagent_it_test.go | 2 +- services/attributes_it_test.go | 2 +- services/cdrs_it_test.go | 2 +- services/chargers_it_test.go | 2 +- services/datadb_it_test.go | 2 +- services/diameteragent_it_test.go | 2 +- services/dispatchers_it_test.go | 2 +- services/dnsagent_it_test.go | 2 +- services/ees_it_test.go | 2 +- services/ers_it_test.go | 2 +- services/freeswitchagent_it_test.go | 2 +- services/kamailioagent_it_test.go | 2 +- services/radiusagent_it_test.go | 2 +- services/rals_it_test.go | 2 +- services/rates_it_test.go | 2 +- services/resources_it_test.go | 2 +- services/routes_it_test.go | 2 +- services/schedulers_it_test.go | 2 +- services/sessions_it_test.go | 2 +- services/sipagent_it_test.go | 2 +- services/stats_it_test.go | 2 +- services/thresholds_it_test.go | 2 +- utils/logger.go | 46 +++++++++++++++-------------- utils/logger_test.go | 46 +++++++++++++++-------------- 30 files changed, 78 insertions(+), 74 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index c1964c11a..eaf998569 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -448,7 +448,7 @@ func main() { config.SetCgrConfig(cfg) // Share the config object // init syslog - if err = utils.Newlogger(utils.FirstNonEmpty(*syslogger, + if utils.Logger, err = utils.Newlogger(utils.FirstNonEmpty(*syslogger, cfg.GeneralCfg().Logger), cfg.GeneralCfg().NodeID); err != nil { log.Fatalf("Could not initialize syslog connection, err: <%s>", err.Error()) return diff --git a/engine/z_poster_it_test.go b/engine/z_poster_it_test.go index eda121ae7..6d765969e 100644 --- a/engine/z_poster_it_test.go +++ b/engine/z_poster_it_test.go @@ -133,7 +133,7 @@ func TestSQSPoster(t *testing.T) { } cfg1 := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) //##################################### @@ -212,7 +212,7 @@ func TestS3Poster(t *testing.T) { } cfg1 := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) //##################################### @@ -273,7 +273,7 @@ func TestAMQPv1Poster(t *testing.T) { } cfg1 := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) //##################################### diff --git a/ers/amqp_it_test.go b/ers/amqp_it_test.go index 2e29ce669..6c54d75af 100644 --- a/ers/amqp_it_test.go +++ b/ers/amqp_it_test.go @@ -64,7 +64,7 @@ func TestAMQPER(t *testing.T) { if err != nil { t.Fatal(err) } - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) rdrEvents = make(chan *erEvent, 1) diff --git a/ers/amqpv1_it_test.go b/ers/amqpv1_it_test.go index c6005ff66..6763a7a18 100644 --- a/ers/amqpv1_it_test.go +++ b/ers/amqpv1_it_test.go @@ -69,7 +69,7 @@ func TestAMQPERv1(t *testing.T) { if err != nil { t.Fatal(err) } - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) rdrEvents = make(chan *erEvent, 1) diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go index a46858f78..8b88f8ff5 100644 --- a/ers/sql_it_test.go +++ b/ers/sql_it_test.go @@ -98,7 +98,7 @@ func testSQLInitConfig(t *testing.T) { }`); err != nil { t.Fatal(err) } - utils.Newlogger(utils.MetaSysLog, sqlCfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, sqlCfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) } diff --git a/services/apiers_it_test.go b/services/apiers_it_test.go index 4722be98f..645987bf1 100644 --- a/services/apiers_it_test.go +++ b/services/apiers_it_test.go @@ -36,7 +36,7 @@ import ( func TestApiersReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index ef7854bb1..1399052a3 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -37,7 +37,7 @@ func TestAsteriskAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/attributes_it_test.go b/services/attributes_it_test.go index 644854f1b..b86b71573 100644 --- a/services/attributes_it_test.go +++ b/services/attributes_it_test.go @@ -37,7 +37,7 @@ import ( func TestAttributeSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index 57c5484e3..c89aee92a 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -36,7 +36,7 @@ import ( func TestCdrsReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/chargers_it_test.go b/services/chargers_it_test.go index 3ca1f3209..160edd761 100644 --- a/services/chargers_it_test.go +++ b/services/chargers_it_test.go @@ -37,7 +37,7 @@ import ( func TestChargerSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true shdChan := utils.NewSyncedChan() diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 23cd47c8e..e02a6b819 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -38,7 +38,7 @@ import ( func TestDataDBReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index 0989c75f2..c81232808 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -37,7 +37,7 @@ func TestDiameterAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/dispatchers_it_test.go b/services/dispatchers_it_test.go index 066386d58..a04cab95d 100644 --- a/services/dispatchers_it_test.go +++ b/services/dispatchers_it_test.go @@ -37,7 +37,7 @@ import ( func TestDispatcherSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true shdChan := utils.NewSyncedChan() diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index b9edfbce3..59b794e31 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -37,7 +37,7 @@ func TestDNSAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/ees_it_test.go b/services/ees_it_test.go index e2beca711..261124c4e 100644 --- a/services/ees_it_test.go +++ b/services/ees_it_test.go @@ -47,7 +47,7 @@ func TestEventExporterSReload(t *testing.T) { } cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/ers_it_test.go b/services/ers_it_test.go index 7182c1f5f..13669ec2f 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -46,7 +46,7 @@ func TestEventReaderSReload(t *testing.T) { } cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.SessionSCfg().Enabled = true filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index 73944fcb2..5705a8d80 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -39,7 +39,7 @@ func TestFreeSwitchAgentReload(t *testing.T) { cfg.SessionSCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index ad4265035..11a9e47db 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -39,7 +39,7 @@ func TestKamailioAgentReload(t *testing.T) { cfg.SessionSCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 51e2747d8..535a849db 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -37,7 +37,7 @@ func TestRadiusAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/rals_it_test.go b/services/rals_it_test.go index 54abe3f88..3e57b1f09 100644 --- a/services/rals_it_test.go +++ b/services/rals_it_test.go @@ -36,7 +36,7 @@ import ( func TestRalsReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/rates_it_test.go b/services/rates_it_test.go index 9c04cc30a..a0468702b 100644 --- a/services/rates_it_test.go +++ b/services/rates_it_test.go @@ -37,7 +37,7 @@ import ( func TestRateSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/resources_it_test.go b/services/resources_it_test.go index c68f7a474..d01a19a7d 100644 --- a/services/resources_it_test.go +++ b/services/resources_it_test.go @@ -38,7 +38,7 @@ func TestResourceSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.ThresholdSCfg().Enabled = true filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/routes_it_test.go b/services/routes_it_test.go index 0e51d4311..6009e300a 100644 --- a/services/routes_it_test.go +++ b/services/routes_it_test.go @@ -37,7 +37,7 @@ import ( func TestSupplierSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.StatSCfg().Enabled = true filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/schedulers_it_test.go b/services/schedulers_it_test.go index d5f148624..2ed512c77 100644 --- a/services/schedulers_it_test.go +++ b/services/schedulers_it_test.go @@ -36,7 +36,7 @@ import ( func TestSchedulerSReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() shdWg := new(sync.WaitGroup) diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index d856f8a1c..156326a95 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -39,7 +39,7 @@ func TestSessionSReload(t *testing.T) { cfg.ChargerSCfg().Enabled = true cfg.RalsCfg().Enabled = true cfg.CdrsCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index b3f27ff77..a3fa27564 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -37,7 +37,7 @@ func TestSIPAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/services/stats_it_test.go b/services/stats_it_test.go index 98c8d8e39..41dbc5898 100644 --- a/services/stats_it_test.go +++ b/services/stats_it_test.go @@ -38,7 +38,7 @@ func TestStatSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.ThresholdSCfg().Enabled = true filterSChan := make(chan *engine.FilterS, 1) diff --git a/services/thresholds_it_test.go b/services/thresholds_it_test.go index 530a9983d..da7381180 100644 --- a/services/thresholds_it_test.go +++ b/services/thresholds_it_test.go @@ -37,7 +37,7 @@ func TestThresholdSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) cfg := config.NewDefaultCGRConfig() - utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil diff --git a/utils/logger.go b/utils/logger.go index 0d340eedc..ba6525903 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -27,27 +27,28 @@ import ( ) var Logger LoggerInterface -var nodeID string func init() { if Logger == nil || reflect.ValueOf(Logger).IsNil() { - Newlogger(MetaSysLog, nodeID) + //used for testing only, so we will ignore the error for now + Logger, _ = Newlogger(MetaSysLog, EmptyString) } } -//functie Newlogger (logger type) -func Newlogger(loggertype, id string) (err error) { - Logger = new(StdLogger) - nodeID = id - var l *syslog.Writer - if loggertype == MetaSysLog { - l, err = syslog.New(syslog.LOG_INFO|syslog.LOG_DAEMON, fmt.Sprintf("CGRateS <%s> ", nodeID)) - Logger.SetSyslog(l) // if we received an error, l is nil - return err - } else if loggertype != MetaStdLog { - return fmt.Errorf("unsuported logger: <%s>", loggertype) +// Newlogger creates the Loggerr object +func Newlogger(loggertype, id string) (lgr LoggerInterface, err error) { + lgr = &StdLogger{nodeID: id} + switch loggertype { + case MetaStdLog: + return + case MetaSysLog: + var l *syslog.Writer + l, err = syslog.New(syslog.LOG_INFO|syslog.LOG_DAEMON, fmt.Sprintf("CGRateS <%s> ", id)) + lgr.SetSyslog(l) // if we received an error, l is nil + return + default: + return nil, fmt.Errorf("unsuported logger: <%s>", loggertype) } - return nil } type LoggerInterface interface { @@ -81,6 +82,7 @@ const ( // Logs to standard output type StdLogger struct { logLevel int + nodeID string syslog *syslog.Writer } @@ -119,7 +121,7 @@ func (sl *StdLogger) Alert(m string) (err error) { if sl.syslog != nil { sl.syslog.Alert(m) } else { - log.Print("CGRateS <" + nodeID + "> [ALERT] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [ALERT] " + m) } return } @@ -132,7 +134,7 @@ func (sl *StdLogger) Crit(m string) (err error) { if sl.syslog != nil { sl.syslog.Crit(m) } else { - log.Print("CGRateS <" + nodeID + "> [CRITICAL] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [CRITICAL] " + m) } return } @@ -145,7 +147,7 @@ func (sl *StdLogger) Debug(m string) (err error) { if sl.syslog != nil { sl.syslog.Debug(m) } else { - log.Print("CGRateS <" + nodeID + "> [DEBUG] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [DEBUG] " + m) } return } @@ -158,7 +160,7 @@ func (sl *StdLogger) Emerg(m string) (err error) { if sl.syslog != nil { sl.syslog.Emerg(m) } else { - log.Print("CGRateS <" + nodeID + "> [EMERGENCY] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [EMERGENCY] " + m) } return } @@ -171,7 +173,7 @@ func (sl *StdLogger) Err(m string) (err error) { if sl.syslog != nil { sl.syslog.Err(m) } else { - log.Print("CGRateS <" + nodeID + "> [ERROR] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [ERROR] " + m) } return } @@ -184,7 +186,7 @@ func (sl *StdLogger) Info(m string) (err error) { if sl.syslog != nil { sl.syslog.Info(m) } else { - log.Print("CGRateS <" + nodeID + "> [INFO] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [INFO] " + m) } return } @@ -197,7 +199,7 @@ func (sl *StdLogger) Notice(m string) (err error) { if sl.syslog != nil { sl.syslog.Notice(m) } else { - log.Print("CGRateS <" + nodeID + "> [NOTICE] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [NOTICE] " + m) } return } @@ -211,7 +213,7 @@ func (sl *StdLogger) Warning(m string) (err error) { if sl.syslog != nil { sl.syslog.Warning(m) } else { - log.Print("CGRateS <" + nodeID + "> [WARNING] " + m) + log.Print("CGRateS <" + sl.nodeID + "> [WARNING] " + m) } return } diff --git a/utils/logger_test.go b/utils/logger_test.go index 7f9720f01..4cfeabdaf 100644 --- a/utils/logger_test.go +++ b/utils/logger_test.go @@ -33,11 +33,11 @@ func TestEmergLogger(t *testing.T) { log.SetOutput(output) loggertype := MetaSysLog id := "id_emerg" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(-1) if err := newLogger.Emerg(EmptyString); err != nil { @@ -61,11 +61,11 @@ func TestAlertLogger(t *testing.T) { log.SetOutput(output) loggertype := MetaSysLog id := "id_alert" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(0) if err := newLogger.Alert("Alert"); err != nil { @@ -90,11 +90,11 @@ func TestCritLogger(t *testing.T) { loggertype := MetaSysLog id := "id_crit" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(1) if err := newLogger.Crit("Critical_level"); err != nil { @@ -119,11 +119,11 @@ func TestErrorLogger(t *testing.T) { loggertype := MetaSysLog id := "id_error" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(2) if err := newLogger.Err("error_panic"); err != nil { @@ -148,11 +148,11 @@ func TestWarningLogger(t *testing.T) { loggertype := MetaSysLog id := "id_error" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(3) if err := newLogger.Warning("warning_panic"); err != nil { @@ -177,11 +177,11 @@ func TestNoticeLogger(t *testing.T) { loggertype := MetaSysLog id := "id_notice" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(4) if err := newLogger.Notice("notice_panic"); err != nil { @@ -206,11 +206,11 @@ func TestInfoLogger(t *testing.T) { loggertype := MetaSysLog id := "id_info" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetLogLevel(5) if err := newLogger.Info("info_panic"); err != nil { @@ -235,12 +235,14 @@ func TestDebugLogger(t *testing.T) { loggertype := MetaSysLog id := "id_debug" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } - newLogger := new(StdLogger) - + newLogger, err := Newlogger(MetaStdLog, id) + if err != nil { + t.Error(err) + } newLogger.SetLogLevel(6) if err := newLogger.Debug("debug_panic"); err != nil { t.Error(err) @@ -264,7 +266,7 @@ func TestWriteLogger(t *testing.T) { loggertype := MetaSysLog id := "id_write" - if err := Newlogger(loggertype, id); err != nil { + if _, err := Newlogger(loggertype, id); err != nil { t.Error(err) } @@ -272,7 +274,7 @@ func TestWriteLogger(t *testing.T) { if err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: id} newLogger.SetSyslog(newWriter) if n, err := newLogger.Write([]byte(EmptyString)); err != nil { @@ -288,11 +290,11 @@ func TestCloseLogger(t *testing.T) { log.SetOutput(ioutil.Discard) loggertype := MetaStdLog - if err := Newlogger(loggertype, EmptyString); err != nil { + if _, err := Newlogger(loggertype, EmptyString); err != nil { t.Error(err) } - newLogger := new(StdLogger) + newLogger := &StdLogger{nodeID: EmptyString} if err := newLogger.Close(); err != nil { t.Error(err) } @@ -318,7 +320,7 @@ func TestNewLoggerInvalidLoggerType(t *testing.T) { loggertype := "Invalid_TYPE" expected := "unsuported logger: " - if err := Newlogger(loggertype, EmptyString); err == nil || err.Error() != expected { + if _, err := Newlogger(loggertype, EmptyString); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } }