From 0fb6c2bbc57581ea660ce9d43c9d9d4b07409084 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Fri, 24 Jun 2022 10:18:15 +0300 Subject: [PATCH] Send LoggerInterface as a parameter to fs instead of the syslog Writer --- agents/fsagent.go | 4 ++-- utils/logger.go | 6 ------ utils/logger_test.go | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/agents/fsagent.go b/agents/fsagent.go index 3a3666109..321da2765 100644 --- a/agents/fsagent.go +++ b/agents/fsagent.go @@ -289,7 +289,7 @@ func (fsa *FSsessions) Connect() error { errChan := make(chan error) for connIdx, connCfg := range fsa.cfg.EventSocketConns { fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, connCfg.MaxReconnectInterval, utils.FibDuration, - fsa.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connIdx, true) + fsa.createHandlers(), eventFilters, utils.Logger, connIdx, true) if err != nil { return err } @@ -304,7 +304,7 @@ func (fsa *FSsessions) Connect() error { } }(fSock) fsSenderPool := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, fsa.cfg.MaxWaitConnection, - 0, utils.FibDuration, make(map[string][]func(string, int)), make(map[string][]string), utils.Logger.GetSyslog(), connIdx, true) + 0, utils.FibDuration, make(map[string][]func(string, int)), make(map[string][]string), utils.Logger, connIdx, true) if fsSenderPool == nil { return errors.New("Cannot connect FreeSWITCH senders pool") } diff --git a/utils/logger.go b/utils/logger.go index c4f574c0b..d03fd854a 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -54,7 +54,6 @@ func Newlogger(loggertype, id string) (lgr LoggerInterface, err error) { type LoggerInterface interface { SetSyslog(log *syslog.Writer) SetLogLevel(level int) - GetSyslog() *syslog.Writer Close() error Emerg(m string) error Alert(m string) error @@ -103,11 +102,6 @@ func (sl *StdLogger) SetSyslog(l *syslog.Writer) { sl.syslog = l } -// GetSyslog returns the logger for the server -func (sl *StdLogger) GetSyslog() *syslog.Writer { - return sl.syslog -} - // SetLogLevel changes the log level func (sl *StdLogger) SetLogLevel(level int) { sl.logLevel = level diff --git a/utils/logger_test.go b/utils/logger_test.go index 61991a330..a4ab8cbcc 100644 --- a/utils/logger_test.go +++ b/utils/logger_test.go @@ -251,7 +251,6 @@ func TestDebugLogger(t *testing.T) { if err := newLogger.Debug("debug_panic"); err != nil { t.Error(err) } - newLogger.GetSyslog() expected := "GRateS [DEBUG] debug_panic" if rcv := output.String(); !strings.Contains(rcv, expected) { t.Errorf("Expected %+v, received %+v", expected, rcv)