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

Send LoggerInterface as a parameter to fs instead of the syslog Writer

Browse Source
This commit is contained in:
ionutboangiu
2022-06-24 10:18:15 +03:00
committed by Dan Christian Bogos
parent d9cd799690
commit 0fb6c2bbc5
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agents/fsagent.go
View File

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

6
utils/logger.go
View File

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

1
utils/logger_test.go
View File

@@ -251,7 +251,6 @@ func TestDebugLogger(t *testing.T) {
if err := newLogger.Debug("debug_panic"); err != nil {
t.Error(err)
}
newLogger.GetSyslog()
expected := "GRateS <id_debug> [DEBUG] debug_panic"
if rcv := output.String(); !strings.Contains(rcv, expected) {
t.Errorf("Expected %+v, received %+v", expected, rcv)