Renamed cache in caches

2026-02-11 18:16:24 +05:00 · 2019-12-18 14:35:39 +02:00
parent 7012c7c7e1
commit b53ee5f19f
15 changed files with 14 additions and 15 deletions
--- a/config/cachecfg_test.go
+++ b/config/cachecfg_test.go
@@ -61,7 +61,7 @@ func TestCacheCfgloadFromJsonCfg(t *testing.T) {
 		t.Errorf("Expected: %+v ,recived: %+v", expected, cachecfg)
 	}
 	cfgJSONStr := `{
-"cache":{
+"caches":{
 	"*destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},			
 	"*reverse_destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},	
 	"*rating_plans": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -152,7 +152,7 @@ const CGRATES_CFG_JSON = `
 },


-"cache":{
+"caches":{
 	"*destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},			// destination caching
 	"*reverse_destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},	// reverse destinations index caching
 	"*rating_plans": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},			// rating plans caching
--- a/config/config_json.go
+++ b/config/config_json.go
@@ -24,7 +24,7 @@ import (

 const (
 	GENERAL_JSN        = "general"
-	CACHE_JSN          = "cache"
+	CACHE_JSN          = "caches"
 	LISTEN_JSN         = "listen"
 	HTTP_JSN           = "http"
 	DATADB_JSN         = "data_db"
--- a/data/conf/cgrates/cgrates.json
+++ b/data/conf/cgrates/cgrates.json
@@ -131,7 +131,7 @@
 // },


-// "cache":{
+// "caches":{
 // 	"*destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},			// destination caching
 // 	"*reverse_destinations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},	// reverse destinations index caching
 // 	"*rating_plans": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false},			// rating plans caching
--- a/data/conf/samples/dispatchers/dispatchers/cgrates.json
+++ b/data/conf/samples/dispatchers/dispatchers/cgrates.json
@@ -23,7 +23,7 @@
 	"db_type":"*internal",
 },

-"cache":{
+"caches":{
 	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },

--- a/data/conf/samples/dispatchers/dispatchers_gob/cgrates.json
+++ b/data/conf/samples/dispatchers/dispatchers_gob/cgrates.json
@@ -23,7 +23,7 @@
 	"db_type":"*internal",
 },

-"cache":{
+"caches":{
 	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },

--- a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json
+++ b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json
@@ -32,7 +32,7 @@
 	"db_port": 27017,
 },

-"cache":{
+"caches":{
 	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },

--- a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json
+++ b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json
@@ -32,7 +32,7 @@
 	"db_port": 27017,
 },

-"cache":{
+"caches":{
 	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },

--- a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json
+++ b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json
@@ -23,7 +23,7 @@
 	"db_type":"*internal",
 },

-"cache":{
+"caches":{
 	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },

--- a/data/conf/samples/gocs/dsp_site/cgrates.json
+++ b/data/conf/samples/gocs/dsp_site/cgrates.json
@@ -20,7 +20,7 @@
    "db_name": "13"
  },

-  "cache":{
+  "caches":{
    "*dispatcher_routes": {"limit": -1, "ttl": "2s"}
  },

--- a/data/conf/samples/mongoatlas/cgrates.json
+++ b/data/conf/samples/mongoatlas/cgrates.json
@@ -35,7 +35,7 @@
 },


-"cache":{
+"caches":{
 	"*destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*rating_plans": {"limit": 10000, "ttl":"0s","precache": true},
--- a/data/conf/samples/precache/tutmongo/cgrates.json
+++ b/data/conf/samples/precache/tutmongo/cgrates.json
@@ -29,7 +29,7 @@
 },


-"cache":{
+"caches":{
 	"*destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*rating_plans": {"limit": 10000, "ttl":"0s","precache": true},
--- a/data/conf/samples/precache/tutmysql/cgrates.json
+++ b/data/conf/samples/precache/tutmysql/cgrates.json
@@ -25,7 +25,7 @@
 },


-"cache":{
+"caches":{
 	"*destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true},
 	"*rating_plans": {"limit": 10000, "ttl":"0s","precache": true},
--- a/data/conf/samples/rpccaching/cgrates.json
+++ b/data/conf/samples/rpccaching/cgrates.json
@@ -17,7 +17,7 @@
 },


-"cache":{
+"caches":{
 	"*rpc_responses": {"limit": -1, "ttl": "1s"},
 },

--- a/utils/consts.go
+++ b/utils/consts.go
@@ -363,7 +363,6 @@ const (
 	NonTransactional            = "" // used in transactional cache mechanism
 	DataDB                      = "data_db"
 	StorDB                      = "stor_db"
-	Cache                       = "cache"
 	NotFoundCaps                = "NOT_FOUND"
 	ServerErrorCaps             = "SERVER_ERROR"
 	MandatoryIEMissingCaps      = "MANDATORY_IE_MISSING"