Add command line flag to cgr-engine for logging levels

This adds a new -log_level flag to cgr-engine, defaulting to 5 (INFO). The logger has been extended to drop log messages that do not meet or exceed the log level requested.
This commit is contained in:
Shane Neuerburg
2016-10-21 19:31:24 -06:00
parent 3bd6ec39bd
commit 6c05c42c44
5 changed files with 118 additions and 17 deletions

View File

@@ -20,7 +20,6 @@ package sessionmanager
import (
"errors"
"fmt"
"log/syslog"
"reflect"
"strconv"
"strings"
@@ -270,7 +269,7 @@ func (sm *FSSessionManager) Connect() error {
errChan := make(chan error)
for _, connCfg := range sm.cfg.EventSocketConns {
connId := utils.GenUUID()
fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, sm.createHandlers(), eventFilters, utils.Logger.(*syslog.Writer), connId)
fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, sm.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connId)
if err != nil {
return err
} else if !fSock.Connected() {
@@ -284,7 +283,7 @@ func (sm *FSSessionManager) Connect() error {
}
}()
if fsSenderPool, err := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, sm.cfg.MaxWaitConnection,
make(map[string][]func(string, string)), make(map[string]string), utils.Logger.(*syslog.Writer), connId); err != nil {
make(map[string][]func(string, string)), make(map[string]string), utils.Logger.GetSyslog(), connId); err != nil {
return fmt.Errorf("Cannot connect FreeSWITCH senders pool, error: %s", err.Error())
} else if fsSenderPool == nil {
return errors.New("Cannot connect FreeSWITCH senders pool.")

View File

@@ -20,7 +20,6 @@ package sessionmanager
import (
"errors"
"fmt"
"log/syslog"
"regexp"
"time"
@@ -171,7 +170,7 @@ func (self *KamailioSessionManager) Connect() error {
errChan := make(chan error)
for _, connCfg := range self.cfg.EvapiConns {
connId := utils.GenUUID()
if self.conns[connId], err = kamevapi.NewKamEvapi(connCfg.Address, connId, connCfg.Reconnects, eventHandlers, utils.Logger.(*syslog.Writer)); err != nil {
if self.conns[connId], err = kamevapi.NewKamEvapi(connCfg.Address, connId, connCfg.Reconnects, eventHandlers, utils.Logger.GetSyslog()); err != nil {
return err
}
go func() { // Start reading in own goroutine, return on error