From 37e5481307d2d6a18099a0f8b22e73147bc22869 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 31 Aug 2021 08:26:24 +0300
Subject: [PATCH] Renamed ignoreErrors constant

---
 config/attributescfg.go      |  2 +-
 config/attributescfg_test.go |  2 +-
 config/filterscfg.go         |  2 +-
 config/filterscfg_test.go    |  2 +-
 docs/sessions.rst            |  2 +-
 engine/routes.go             |  2 +-
 engine/routes_test.go        | 16 ++++++++++++++++
 utils/consts.go              |  2 +-
 8 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/config/attributescfg.go b/config/attributescfg.go
index ef9023924..65b48b98b 100644
--- a/config/attributescfg.go
+++ b/config/attributescfg.go
@@ -48,7 +48,7 @@ func (alS *AttributeSCfg) loadFromJSONCfg(jsnCfg *AttributeSJsonCfg) (err error)
 		alS.ResourceSConns = updateInternalConns(*jsnCfg.Resources_conns, utils.MetaResources)
 	}
 	if jsnCfg.Accounts_conns != nil {
-		alS.AccountSConns = updateInternalConns(*jsnCfg.Accounts_conns, utils.MetaAdminS)
+		alS.AccountSConns = updateInternalConns(*jsnCfg.Accounts_conns, utils.MetaAccounts)
 	}
 	if jsnCfg.Indexed_selects != nil {
 		alS.IndexedSelects = *jsnCfg.Indexed_selects
diff --git a/config/attributescfg_test.go b/config/attributescfg_test.go
index 5d942c45f..64dcc6880 100644
--- a/config/attributescfg_test.go
+++ b/config/attributescfg_test.go
@@ -38,7 +38,7 @@ func TestAttributeSCfgloadFromJsonCfg(t *testing.T) {
 	}
 	expected := &AttributeSCfg{
 		Enabled:             true,
-		AccountSConns:       []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAdminS), "*conn1"},
+		AccountSConns:       []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts), "*conn1"},
 		StatSConns:          []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats), "*conn1"},
 		ResourceSConns:      []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"},
 		IndexedSelects:      false,
diff --git a/config/filterscfg.go b/config/filterscfg.go
index 0dafb74a1..48efdd2be 100644
--- a/config/filterscfg.go
+++ b/config/filterscfg.go
@@ -40,7 +40,7 @@ func (fSCfg *FilterSCfg) loadFromJSONCfg(jsnCfg *FilterSJsonCfg) (err error) {
 		fSCfg.ResourceSConns = updateInternalConns(*jsnCfg.Resources_conns, utils.MetaResources)
 	}
 	if jsnCfg.Accounts_conns != nil {
-		fSCfg.AccountSConns = updateInternalConns(*jsnCfg.Accounts_conns, utils.MetaAdminS)
+		fSCfg.AccountSConns = updateInternalConns(*jsnCfg.Accounts_conns, utils.MetaAccounts)
 	}
 	return
 }
diff --git a/config/filterscfg_test.go b/config/filterscfg_test.go
index 53d6872b1..2a4377bce 100644
--- a/config/filterscfg_test.go
+++ b/config/filterscfg_test.go
@@ -33,7 +33,7 @@ func TestFilterSCfgloadFromJsonCfg(t *testing.T) {
 	expected := &FilterSCfg{
 		StatSConns:     []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats), "*conn1"},
 		ResourceSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"},
-		AccountSConns:  []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAdminS), "*conn1"},
+		AccountSConns:  []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts), "*conn1"},
 	}
 	jsnCfg := NewDefaultCGRConfig()
 	if err = jsnCfg.filterSCfg.loadFromJSONCfg(cfgJSONS); err != nil {
diff --git a/docs/sessions.rst b/docs/sessions.rst
index 5b054cd2f..dc40ea27e 100644
--- a/docs/sessions.rst
+++ b/docs/sessions.rst
@@ -341,7 +341,7 @@ Instead of arguments, the options for enabling various functionaity will come in
 \*routes
 	Process the event with :ref:`Routes`. Auxiliary flags available:
 
-	**\*ignore_errors**
+	**\*ignoreErrors**
 		Ignore the routes with errors instead of failing the request completely.
 
 	**\*event_cost**
diff --git a/engine/routes.go b/engine/routes.go
index 1244cb95b..aa2364f97 100644
--- a/engine/routes.go
+++ b/engine/routes.go
@@ -217,7 +217,7 @@ func (attr *ArgsGetRoutes) Clone() *ArgsGetRoutes {
 }
 
 func (attr *ArgsGetRoutes) asOptsGetRoutes() (opts *optsGetRoutes, err error) {
-	opts = &optsGetRoutes{ignoreErrors: utils.OptAsBoolOrDef(attr.APIOpts, utils.MetaIgnoreErrors, attr.IgnoreErrors)}
+	opts = &optsGetRoutes{ignoreErrors: utils.OptAsBoolOrDef(config.CgrConfig().RouteSCfg().DefaultOpts, utils.MetaIgnoreErrors, attr.IgnoreErrors)}
 	if attr.MaxCost == utils.MetaEventCost { // dynamic cost needs to be calculated from event
 		if err = attr.CGREvent.CheckMandatoryFields([]string{utils.AccountField,
 			utils.Destination, utils.SetupTime, utils.Usage}); err != nil {
diff --git a/engine/routes_test.go b/engine/routes_test.go
index ed24651e8..753cedecb 100644
--- a/engine/routes_test.go
+++ b/engine/routes_test.go
@@ -1522,6 +1522,22 @@ func TestRoutesAsOptsGetRoutes(t *testing.T) {
 	}
 }
 
+func TestRoutesAsOptsGetRoutesFromCfg(t *testing.T) {
+	config.CgrConfig().RouteSCfg().DefaultOpts[utils.MetaIgnoreErrors] = true
+	s := &ArgsGetRoutes{}
+	spl := &optsGetRoutes{
+		ignoreErrors: true,
+	}
+	sprf, err := s.asOptsGetRoutes()
+	if err != nil {
+		t.Errorf("Error: %+v", err)
+	}
+	if !reflect.DeepEqual(spl, sprf) {
+		t.Errorf("Expecting: %+v,received: %+v", spl, sprf)
+	}
+	delete(config.CgrConfig().RouteSCfg().DefaultOpts, utils.MetaIgnoreErrors)
+}
+
 func TestRoutesAsOptsGetRoutesIgnoreErrors(t *testing.T) {
 	s := &ArgsGetRoutes{
 		IgnoreErrors: true,
diff --git a/utils/consts.go b/utils/consts.go
index 5bb5835a6..a7e901178 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -659,7 +659,7 @@ const (
 	MetaAnalyzer            = "*analyzer"
 	CGREventString          = "CGREvent"
 	MetaTextPlain           = "*text_plain"
-	MetaIgnoreErrors        = "*ignore_errors"
+	MetaIgnoreErrors        = "*ignoreErrors"
 	MetaRelease             = "*release"
 	MetaAllocate            = "*allocate"
 	MetaAuthorize           = "*authorize"