Merge pull request #1838 from adragusin/master

Added cache partitions check

config/config_defaults.go

@@ -150,7 +150,7 @@ const CGRATES_CFG_JSON = `
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": false,				// start Scheduler service: <true|false>
 	"cdrs_conns": [],				// connections to CDRs for *cdrlog actions <*internal|x.y.z.y:1234>
 	"filters": [],					// only execute actions matching these filters

config/config_json.go

@@ -31,7 +31,7 @@ const (
 	STORDB_JSN         = "stor_db"
 	FilterSjsn         = "filters"
 	RALS_JSN           = "rals"
-	SCHEDULER_JSN      = "scheduler"
+	SCHEDULER_JSN      = "schedulers"
 	CDRS_JSN           = "cdrs"
 	CDRE_JSN           = "cdre"
 	CDRC_JSN           = "cdrc"

config/configsanity.go

@@ -486,5 +486,12 @@ func (cfg *CGRConfig) checkConfigSanity() error {
 			}
 		}
 	}
+	// Cache partitions check
+	for cacheID := range cfg.cacheCfg {
+		if _, has := utils.CachePartitions[cacheID]; !has {
+			return fmt.Errorf("<%s> partition <%s> not defined", utils.CacheS, cacheID)
+		}
+	}
+
 	return nil
 }

config/configsanity_test.go

@@ -580,8 +580,8 @@ func TestConfigSanityDataDB(t *testing.T) {
 	cfg.dataDbCfg.DataDbType = utils.INTERNAL
 
 	cfg.cacheCfg = CacheCfg{
-		"test": &CacheParamCfg{
-			Limit: 1,
+		utils.CacheTimings: &CacheParamCfg{
+			Limit: 0,
 		},
 	}
 	if err := cfg.checkConfigSanity(); err != nil {
@@ -641,3 +641,16 @@ func TestConfigSanityDataDB(t *testing.T) {
 	}
 
 }
+func TestConfigSanityCacheS(t *testing.T) {
+	cfg, _ = NewDefaultCGRConfig()
+
+	cfg.cacheCfg = map[string]*CacheParamCfg{"wrong_partition_name": &CacheParamCfg{Limit: 10}}
+	if err := cfg.checkConfigSanity(); err == nil || err.Error() != "<CacheS> partition <wrong_partition_name> not defined" {
+		t.Error(err)
+	}
+
+	cfg.cacheCfg = map[string]*CacheParamCfg{utils.CacheLoadIDs: &CacheParamCfg{Limit: 9}}
+	if err := cfg.checkConfigSanity(); err != nil {
+		t.Error(err)
+	}
+}

config/schedulercfg_test.go

@@ -35,7 +35,7 @@ func TestSchedulerCfgloadFromJsonCfg(t *testing.T) {
 		t.Errorf("Expected: %+v ,recived: %+v", expected, schdcfg)
 	}
 	cfgJSONStr := `{
-"scheduler": {
+"schedulers": {
 	"enabled": true,				// start Scheduler service: <true|false>
 	"cdrs_conns": [],				// address where to reach CDR Server, empty to disable CDR capturing <*internal|x.y.z.y:1234>
 	},

data/conf/cgrates/cgrates.json

@@ -124,7 +124,7 @@
 // },
 
 
-// "scheduler": {
+// "schedulers": {
 // 	"enabled": false,				// start Scheduler service: <true|false>
 // 	"cdrs_conns": [],				// connections to CDRs for *cdrlog actions <*internal|x.y.z.y:1234>
 // 	"filters": [],					// only execute actions matching these filters

data/conf/samples/acc_balance_keep/cgrates.json

@@ -36,7 +36,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*localhost"],
 },

data/conf/samples/acc_balance_keep_gob/cgrates.json

@@ -43,7 +43,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["conn1"],
 },

data/conf/samples/actions/cgradmin.json

@@ -24,7 +24,7 @@
 	"enabled": true,						// enable Rater service: <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/actions_gob/cgradmin.json

@@ -31,7 +31,7 @@
 	"enabled": true,						// enable Rater service: <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/apier/apier.json

@@ -28,7 +28,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/cdrcflatstore/cgrates.json

@@ -20,7 +20,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/cdrcfwv/cgrates.json

@@ -19,7 +19,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/cdrcfwvwithfilter/cgrates.json

@@ -19,7 +19,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/cdrewithattributes/cgrates.json

@@ -31,7 +31,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrewithfilter/cgrates.json

@@ -32,7 +32,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv1internal/cgrates.json

@@ -19,7 +19,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1mongo/cgrates.json

@@ -22,7 +22,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1mysql/cgrates.json

@@ -19,7 +19,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1postgres/cgrates.json

@@ -21,7 +21,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1processevent/cgrates.json

@@ -53,7 +53,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1processeventmongo/cgrates.json

@@ -57,7 +57,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv1processeventmysql/cgrates.json

@@ -54,7 +54,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/cdrsv2internal/cgrates.json

@@ -18,7 +18,7 @@
 	"thresholds_conns": ["*localhost"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv2mongo/cgrates.json

@@ -19,7 +19,7 @@
 	"thresholds_conns": ["*localhost"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv2mongo_gob/cgrates.json

@@ -28,7 +28,7 @@
 	"thresholds_conns": ["conn1"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv2mysql/cdrsv2mysql.json

@@ -19,7 +19,7 @@
 	"thresholds_conns": ["*localhost"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json

@@ -27,7 +27,7 @@
 	"thresholds_conns": ["conn1"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cdrsv2psql/cdrsv2psql.json

@@ -19,7 +19,7 @@
 	"thresholds_conns": ["*localhost"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/cluelrn/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/dbinternal/cgrates.json

@@ -30,7 +30,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/diamagent/cgrates.json

@@ -33,7 +33,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/diamagentmaxconn/cgrates.json

@@ -32,7 +32,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/diamsctpagent/cgrates.json

@@ -33,7 +33,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/dispatchers/all/cgrates.json

@@ -42,7 +42,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/all2/cgrates.json

@@ -42,7 +42,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/diamagent/cgrates.json

@@ -34,7 +34,7 @@
 	"enabled": true
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true
 },
 

data/conf/samples/dispatchers/dispatchers/cgrates.json

@@ -32,7 +32,7 @@
 	"enabled": true
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/dispatchers_gob/cgrates.json

@@ -32,7 +32,7 @@
 	"enabled": true
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json

@@ -36,7 +36,7 @@
  	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json

@@ -36,7 +36,7 @@
  	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json

@@ -27,7 +27,7 @@
  	"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dispatchers/radagent/cgrates.json

@@ -33,7 +33,7 @@
 	"enabled": true
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/dnsagent/cgrates.json

@@ -17,7 +17,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/dnsagent_reload/cgrates.json

@@ -17,7 +17,7 @@
     },
     
     
-    "scheduler": {
+    "schedulers": {
         "enabled": true,
         "cdrs_conns": ["*internal"],
     },

data/conf/samples/ers/cgrates.json

@@ -27,7 +27,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/ers_example/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/ers_reload/disabled/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/ers_reload/first_reload/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/ers_reload/internal/cgrates.json

@@ -26,7 +26,7 @@
     },
     
     
-    "scheduler": {
+    "schedulers": {
         "enabled": true,
     },
     

data/conf/samples/ers_reload/second_reload/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/filtered_scheduler/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"filters": ["*suffix:~*act.AccountID:1001"],
 },

data/conf/samples/filtered_scheduler2/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"filters": ["*suffix:~*act.AccountID:1002;1003"],
 },

data/conf/samples/filters/cgrates.json

@@ -33,7 +33,7 @@
 	"thresholds_conns": ["*localhost"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/filters_gob/cgrates.json

@@ -40,7 +40,7 @@
 	"thresholds_conns": ["conn1"],
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,				
 },
 

data/conf/samples/fscsv/cgrates.json

@@ -10,7 +10,7 @@
 	"enabled": true,					// enable Rater service: <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,					// start Scheduler service: <true|false>
 },
 

data/conf/samples/gocs/au_site/cgrates.json

@@ -63,7 +63,7 @@
   },
 
 
-  "scheduler": {
+  "schedulers": {
     "enabled": true,
   },
 

data/conf/samples/gocs/dsp_site/cgrates.json

@@ -34,7 +34,7 @@
   },
 
 
-  "scheduler": {
+  "schedulers": {
     "enabled": true
   },
 

data/conf/samples/gocs/us_site/cgrates.json

@@ -69,7 +69,7 @@
   },
 
 
-  "scheduler": {
+  "schedulers": {
     "enabled": true,
     "cdrs_conns": ["conn1"],
   },

data/conf/samples/httpagent/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/httpagent_gob/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/httpagenttls/cgrates.json

@@ -37,7 +37,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/httpagenttls_gob/cgrates.json

@@ -46,7 +46,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/internal_broadcast_replication/cgrates.json

@@ -43,7 +43,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["broadcast_conn"],
 },

data/conf/samples/loaders/tutmongo/cgrates.json

@@ -35,7 +35,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*localhost"],
 },

data/conf/samples/loaders/tutmysql/cgrates.json

@@ -32,7 +32,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/mongoatlas/cgrates.json

@@ -69,7 +69,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/mongoreplica/cgrates.json

@@ -41,7 +41,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/multiplecdrc/multiplecdrc_fwexport.json

@@ -12,7 +12,7 @@
 	"enabled": true,						// enable Rater service: <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/precache/tutmongo/cgrates.json

@@ -65,7 +65,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/precache/tutmysql/cgrates.json

@@ -61,7 +61,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/radagent/cgrates.json

@@ -31,7 +31,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/radagent_gob/cgrates.json

@@ -39,7 +39,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/engine1_mongo/cgrates.json

@@ -31,7 +31,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/engine1_redis/cgrates.json

@@ -27,7 +27,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/engine2_mongo/cgrates.json

@@ -31,7 +31,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/engine2_redis/cgrates.json

@@ -27,7 +27,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/internal/cgrates.json

@@ -74,7 +74,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/remote_replication/internal_gob/cgrates.json

@@ -80,7 +80,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/rpccaching/cgrates.json

@@ -27,7 +27,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/sessions/cgrates.json

@@ -26,7 +26,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/sessions_replication/smgreplcmaster/cgrates.json

@@ -20,7 +20,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/sessions_replication/smgreplcslave/cgrates.json

@@ -33,7 +33,7 @@
 	"enabled": true,					// start the CDR Server service:  <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/smg/cgrates.json

@@ -28,7 +28,7 @@
 	},
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,					// start Scheduler service: <true|false>
 },
 

data/conf/samples/smg_automatic_debits/cgrates.json

@@ -15,7 +15,7 @@
 	"enabled": true,					// enable Rater service: <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,					// start Scheduler service: <true|false>
 },
 

data/conf/samples/smg_gob/cgrates.json

@@ -35,7 +35,7 @@
 	},
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,					// start Scheduler service: <true|false>
 },
 

data/conf/samples/smgeneric/cgrates.json

@@ -32,7 +32,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
 

data/conf/samples/smgreplcmaster/cgrates.json

@@ -20,7 +20,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/smgreplcmaster_gob/cgrates.json

@@ -20,7 +20,7 @@
 	"enabled": true,
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/smgreplcslave/cgrates.json

@@ -32,7 +32,7 @@
 	"enabled": true,					// start the CDR Server service:  <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/smgreplcslave_gob/cgrates.json

@@ -24,7 +24,7 @@
 	"enabled": true,					// start the CDR Server service:  <true|false>
 },
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/tutinternal/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/tutmongo/cgrates.json

@@ -36,7 +36,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*localhost"],
 },

data/conf/samples/tutmongo2/cgrates.json

@@ -29,7 +29,7 @@
 
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*localhost"],
 },

data/conf/samples/tutmongo2_gob/cgrates.json

@@ -36,7 +36,7 @@
 
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["conn1"],
 },

data/conf/samples/tutmongo_gob/cgrates.json

@@ -43,7 +43,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["conn1"],
 },

data/conf/samples/tutmongonew/cgrates.json

@@ -35,7 +35,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 },
 

data/conf/samples/tutmysql/cgrates.json

@@ -33,7 +33,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*internal"],
 },

data/conf/samples/tutmysql2/cgrates.json

@@ -21,7 +21,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["*localhost"],
 },

data/conf/samples/tutmysql2_gob/cgrates.json

@@ -29,7 +29,7 @@
 },
 
 
-"scheduler": {
+"schedulers": {
 	"enabled": true,
 	"cdrs_conns": ["conn1"],
 },