Logger config

This commit is contained in:
adi
2022-06-27 10:51:58 +03:00
committed by Dan Christian Bogos
parent 480725595a
commit 7cfa7c2697
6 changed files with 192 additions and 1 deletions

View File

@@ -104,6 +104,9 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
ExporterIDs: []*utils.DynamicStringSliceOpt{},
},
},
loggerCfg: &LoggerCfg{
Opts: new(LoggerOptsCfg),
},
dataDbCfg: &DataDbCfg{
Items: make(map[string]*ItemOpts),
Opts: &DataDBOpts{},
@@ -320,6 +323,7 @@ type CGRConfig struct {
templates FCTemplates
generalCfg *GeneralCfg // General config
loggerCfg *LoggerCfg // Logger config
dataDbCfg *DataDbCfg // Database config
tlsCfg *TLSCfg // TLS config
cacheCfg *CacheCfg // Cache config
@@ -603,6 +607,13 @@ func (cfg *CGRConfig) GeneralCfg() *GeneralCfg {
return cfg.generalCfg
}
// LoggerCfg returns the General config section
func (cfg *CGRConfig) LoggerCfg() *LoggerCfg {
cfg.lks[LoggerJSON].Lock()
defer cfg.lks[LoggerJSON].Unlock()
return cfg.loggerCfg
}
// TLSCfg returns the config for Tls
func (cfg *CGRConfig) TLSCfg() *TLSCfg {
cfg.lks[TlsJSON].Lock()
@@ -998,6 +1009,7 @@ func (cfg *CGRConfig) Clone() (cln *CGRConfig) {
rpcConns: cfg.rpcConns.Clone(),
templates: cfg.templates.Clone(),
generalCfg: cfg.generalCfg.Clone(),
loggerCfg: cfg.loggerCfg.Clone(),
dataDbCfg: cfg.dataDbCfg.Clone(),
tlsCfg: cfg.tlsCfg.Clone(),
cacheCfg: cfg.cacheCfg.Clone(),

View File

@@ -69,6 +69,15 @@ const CGRATES_CFG_JSON = `
},
},
"logger": {
"type": "*syslog", // controls the destination of logs <*syslog|*stdout|*kafka>
"level": 6, // system level precision for floats
"opts": {
"*kafka_conn": "", // the connection trough kafka
"*kafka_topic": "", // the topic from where the events are exported
"*attempts": 1, // number of attempts of connecting
},
},
"cores": {
"caps": 0, // maximum concurrent request allowed ( 0 to disabled )

View File

@@ -27,6 +27,7 @@ import (
const (
GeneralJSON = "general"
LoggerJSON = "logger"
CacheJSON = "caches"
ListenJSON = "listen"
HTTPJSON = "http"
@@ -150,6 +151,7 @@ type Section interface {
func newSections(cfg *CGRConfig) Sections {
return Sections{
cfg.generalCfg,
cfg.loggerCfg,
cfg.rpcConns,
cfg.dataDbCfg,
cfg.listenCfg,

File diff suppressed because one or more lines are too long

162
config/logger.go Normal file
View File

@@ -0,0 +1,162 @@
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package config
import (
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
)
type LoggerCfg struct {
Type string
Level int
Opts *LoggerOptsCfg
}
// Load loads the Logger section of the configuration
func (loggCfg *LoggerCfg) Load(ctx *context.Context, jsnCfg ConfigDB, _ *CGRConfig) (err error) {
jsnLoggerCfg := new(LoggerJsonCfg)
if err = jsnCfg.GetSection(ctx, LoggerJSON, jsnLoggerCfg); err != nil {
return
}
return loggCfg.loadFromJSONCfg(jsnLoggerCfg)
}
// loadFromJSONCfg loads Logger config from JsonCfg
func (loggCfg *LoggerCfg) loadFromJSONCfg(jsnLoggerCfg *LoggerJsonCfg) (err error) {
if loggCfg == nil {
return nil
}
if jsnLoggerCfg.Type != nil && *jsnLoggerCfg.Type != utils.EmptyString {
loggCfg.Type = *jsnLoggerCfg.Type
}
if jsnLoggerCfg.Level != nil {
loggCfg.Level = *jsnLoggerCfg.Level
}
if jsnLoggerCfg.Opts != nil {
loggCfg.Opts.loadFromJSONCfg(jsnLoggerCfg.Opts)
}
return
}
// AsMapInterface returns the config of logger as a map[string]interface{}
func (loggCfg *LoggerCfg) AsMapInterface(string) interface{} {
return map[string]interface{}{
utils.TypeCfg: loggCfg.Type,
utils.LevelCfg: loggCfg.Level,
utils.OptsCfg: loggCfg.Opts.AsMapInterface(),
}
}
type LoggerOptsCfg struct {
KafkaConn string `json:"*kakfa_conn"`
KafkaTopic string `json:"*kakfa_topic"`
Attempts int `json:"*attempts"`
}
func (LoggerCfg) SName() string { return LoggerJSON }
func (loggCfg LoggerCfg) CloneSection() Section { return loggCfg.Clone() }
// Clone returns a deep copy of LoggerCfg
func (loggCfg LoggerCfg) Clone() *LoggerCfg {
return &LoggerCfg{
Type: loggCfg.Type,
Level: loggCfg.Level,
Opts: loggCfg.Opts.Clone(),
}
}
// loadFromJSONCfg loads Logger opts config from JsonCfg
func (loggOpts *LoggerOptsCfg) loadFromJSONCfg(jsnCfg *LoggerOptsJson) {
if jsnCfg == nil {
return
}
if jsnCfg.Kafka_conn != nil && *jsnCfg.Kafka_conn != utils.EmptyString {
loggOpts.KafkaConn = *jsnCfg.Kafka_conn
}
if jsnCfg.Kafka_topic != nil {
loggOpts.KafkaTopic = *jsnCfg.Kafka_topic
}
if jsnCfg.Attempts != nil {
loggOpts.Attempts = *jsnCfg.Attempts
}
}
// AsMapInterface returns the config of logger OPTS as a map[string]interface{}
func (loggOpts *LoggerOptsCfg) AsMapInterface() interface{} {
return map[string]interface{}{
utils.KafkaConnCfg: loggOpts.KafkaConn,
utils.KafkaTopicCfg: loggOpts.KafkaTopic,
utils.AttemptsCfg: loggOpts.Attempts,
}
}
// Clone returns a deep copy of LoggerOpts
func (loggerOpts *LoggerOptsCfg) Clone() *LoggerOptsCfg {
if loggerOpts == nil {
return nil
}
return &LoggerOptsCfg{
KafkaConn: loggerOpts.KafkaConn,
KafkaTopic: loggerOpts.KafkaTopic,
Attempts: loggerOpts.Attempts,
}
}
type LoggerJsonCfg struct {
Type *string
Level *int
Opts *LoggerOptsJson
}
type LoggerOptsJson struct {
Kafka_conn *string
Kafka_topic *string
Attempts *int
}
func diffLoggerJsonCfg(d *LoggerJsonCfg, v1, v2 *LoggerCfg) *LoggerJsonCfg {
if d == nil {
d = new(LoggerJsonCfg)
}
if v1.Type != v2.Type {
d.Type = utils.StringPointer(v2.Type)
}
if v1.Level != v2.Level {
d.Level = utils.IntPointer(v2.Level)
}
d.Opts = diffLoggerOptsJsonCfg(d.Opts, v1.Opts, v2.Opts)
return d
}
func diffLoggerOptsJsonCfg(d *LoggerOptsJson, v1, v2 *LoggerOptsCfg) *LoggerOptsJson {
if d == nil {
d = new(LoggerOptsJson)
}
if v1.KafkaConn != v2.KafkaConn {
d.Kafka_conn = utils.StringPointer(v2.KafkaConn)
}
if v1.KafkaTopic != v2.KafkaTopic {
d.Kafka_topic = utils.StringPointer(v2.KafkaTopic)
}
if v1.Attempts != v2.Attempts {
d.Attempts = utils.IntPointer(v2.Attempts)
}
return d
}

View File

@@ -1728,6 +1728,12 @@ const (
DecimalRoundingModeCfg = "decimal_rounding_mode"
)
const (
LevelCfg = "level"
KafkaConnCfg = "*kafka_conn"
KafkaTopicCfg = "*kafka_topic"
)
const (
TypeCfg = "type"
SQLMaxOpenConnsCfg = "sqlMaxOpenConns"