diff --git a/config/config.go b/config/config.go index 631c25df3..0dd771d05 100644 --- a/config/config.go +++ b/config/config.go @@ -99,7 +99,6 @@ type CGRConfig struct { CdreFWXmlTemplate *CgrXmlCdreFwCfg // Use this configuration as export template in case of fixed fields length CdrcEnabled bool // Enable CDR client functionality CdrcCdrs string // Address where to reach CDR server - CdrcCdrsMethod string // Mechanism to use when posting CDRs on server CdrcRunDelay time.Duration // Sleep interval between consecutive runs, 0 to use automation via inotify CdrcCdrType string // CDR file format . CdrcCdrInDir string // Absolute path towards the directory where the CDRs are stored. @@ -158,7 +157,7 @@ func (self *CGRConfig) setDefaults() error { self.DefaultCategory = "call" self.DefaultTenant = "cgrates.org" self.DefaultSubject = "cgrates" - self.RoundingDecimals = 4 + self.RoundingDecimals = 10 self.XmlCfgDocument = nil self.RaterEnabled = false self.RaterBalancer = "" @@ -174,7 +173,6 @@ func (self *CGRConfig) setDefaults() error { self.CdreDir = "/var/log/cgrates/cdre" self.CdrcEnabled = false self.CdrcCdrs = utils.INTERNAL - self.CdrcCdrsMethod = "http_cgr" self.CdrcRunDelay = time.Duration(0) self.CdrcCdrType = utils.CSV self.CdrcCdrInDir = "/var/log/cgrates/cdrc/in" @@ -456,9 +454,6 @@ func loadConfig(c *conf.ConfigFile) (*CGRConfig, error) { if hasOpt = c.HasOption("cdrc", "cdrs"); hasOpt { cfg.CdrcCdrs, _ = c.GetString("cdrc", "cdrs") } - if hasOpt = c.HasOption("cdrc", "cdrs_method"); hasOpt { - cfg.CdrcCdrsMethod, _ = c.GetString("cdrc", "cdrs_method") - } if hasOpt = c.HasOption("cdrc", "run_delay"); hasOpt { durStr, _ := c.GetString("cdrc", "run_delay") if cfg.CdrcRunDelay, err = utils.ParseDurationWithSecs(durStr); err != nil { diff --git a/config/config_test.go b/config/config_test.go index f055d91f3..615fd3a1a 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -72,7 +72,7 @@ func TestDefaults(t *testing.T) { eCfg.DefaultCategory = "call" eCfg.DefaultTenant = "cgrates.org" eCfg.DefaultSubject = "cgrates" - eCfg.RoundingDecimals = 4 + eCfg.RoundingDecimals = 10 eCfg.XmlCfgDocument = nil eCfg.RaterEnabled = false eCfg.RaterBalancer = "" @@ -88,7 +88,6 @@ func TestDefaults(t *testing.T) { eCfg.CdreDir = "/var/log/cgrates/cdre" eCfg.CdrcEnabled = false eCfg.CdrcCdrs = utils.INTERNAL - eCfg.CdrcCdrsMethod = "http_cgr" eCfg.CdrcRunDelay = time.Duration(0) eCfg.CdrcCdrType = "csv" eCfg.CdrcCdrInDir = "/var/log/cgrates/cdrc/in" @@ -233,7 +232,6 @@ func TestConfigFromFile(t *testing.T) { eCfg.CdreDir = "test" eCfg.CdrcEnabled = true eCfg.CdrcCdrs = "test" - eCfg.CdrcCdrsMethod = "test" eCfg.CdrcRunDelay = time.Duration(99) * time.Second eCfg.CdrcCdrType = "test" eCfg.CdrcCdrInDir = "test" diff --git a/config/test_data.txt b/config/test_data.txt index d4f81c2bb..b45c2ff67 100644 --- a/config/test_data.txt +++ b/config/test_data.txt @@ -57,7 +57,6 @@ export_template = test # List of fields in the exported CDRs [cdrc] enabled = true # Enable CDR client functionality cdrs = test # Address where to reach CDR server -cdrs_method = test # Mechanism to use when posting CDRs on server run_delay = 99 # Period to sleep between two runs, 0 to use automation via inotify cdr_type = test # CDR file format . cdr_in_dir = test # Absolute path towards the direccategoryy where the CDRs are kept (file scategoryed CDRs).