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

Updated NewLogger function

Browse Source
This commit is contained in:
Trial97
2020-12-07 12:13:41 +02:00
committed by Dan Christian Bogos
parent 1146e2ef2f
commit 65ce36fbe1
30 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
engine/z_poster_it_test.go
View File

@@ -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)
//#####################################

2
ers/amqp_it_test.go
View File

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

2
ers/amqpv1_it_test.go
View File

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

2
ers/sql_it_test.go
View File

@@ -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)
}

2
services/apiers_it_test.go
View File

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

2
services/asteriskagent_it_test.go
View File

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

2
services/attributes_it_test.go
View File

@@ -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()

2
services/cdrs_it_test.go
View File

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

2
services/chargers_it_test.go
View File

@@ -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()

2
services/datadb_it_test.go
View File

@@ -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()

2
services/diameteragent_it_test.go
View File

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

2
services/dispatchers_it_test.go
View File

@@ -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()

2
services/dnsagent_it_test.go
View File

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

2
services/ees_it_test.go
View File

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

2
services/ers_it_test.go
View File

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

2
services/freeswitchagent_it_test.go
View File

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

2
services/kamailioagent_it_test.go
View File

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

2
services/radiusagent_it_test.go
View File

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

2
services/rals_it_test.go
View File

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

2
services/rates_it_test.go
View File

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

2
services/resources_it_test.go
View File

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

2
services/routes_it_test.go
View File

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

2
services/schedulers_it_test.go
View File

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

2
services/sessions_it_test.go
View File

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

2
services/sipagent_it_test.go
View File

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

2
services/stats_it_test.go
View File

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

2
services/thresholds_it_test.go
View File

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

46
utils/logger.go
View File

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

46
utils/logger_test.go
View File

@@ -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: <Invalid_TYPE>"
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)
}
}