diff --git a/config/config_it_test.go b/config/config_it_test.go index 1c119d896..fbaaf0755 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -1249,10 +1249,12 @@ func testApisLoadFromPath(t *testing.T) { "general": { - "log_level": 7, "reply_timeout": "50s" }, + "logger": { + "level": 7, + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/acc_generaltest_internal/cgrates.json b/data/conf/samples/acc_generaltest_internal/cgrates.json index 8a9b87d0d..d887a2f50 100644 --- a/data/conf/samples/acc_generaltest_internal/cgrates.json +++ b/data/conf/samples/acc_generaltest_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/acc_generaltest_mongo/cgrates.json b/data/conf/samples/acc_generaltest_mongo/cgrates.json index 6cfbd9402..ee0b408f0 100644 --- a/data/conf/samples/acc_generaltest_mongo/cgrates.json +++ b/data/conf/samples/acc_generaltest_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/acc_generaltest_mysql/cgrates.json b/data/conf/samples/acc_generaltest_mysql/cgrates.json index 1279edc62..a06c9546a 100644 --- a/data/conf/samples/acc_generaltest_mysql/cgrates.json +++ b/data/conf/samples/acc_generaltest_mysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/actions_internal/cgradmin.json b/data/conf/samples/actions_internal/cgradmin.json index 31903d7ea..6c8d3d881 100644 --- a/data/conf/samples/actions_internal/cgradmin.json +++ b/data/conf/samples/actions_internal/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/actions_internal_gob/cgradmin.json b/data/conf/samples/actions_internal_gob/cgradmin.json index 9e0bc0e9a..2936b6b8f 100644 --- a/data/conf/samples/actions_internal_gob/cgradmin.json +++ b/data/conf/samples/actions_internal_gob/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/actions_mongo/cgradmin.json b/data/conf/samples/actions_mongo/cgradmin.json index 1c9e1c404..306be5b41 100644 --- a/data/conf/samples/actions_mongo/cgradmin.json +++ b/data/conf/samples/actions_mongo/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/actions_mongo_gob/cgradmin.json b/data/conf/samples/actions_mongo_gob/cgradmin.json index 0b85c2528..99591633f 100644 --- a/data/conf/samples/actions_mongo_gob/cgradmin.json +++ b/data/conf/samples/actions_mongo_gob/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/actions_mysql/cgradmin.json b/data/conf/samples/actions_mysql/cgradmin.json index 5920d80f8..3367550fd 100644 --- a/data/conf/samples/actions_mysql/cgradmin.json +++ b/data/conf/samples/actions_mysql/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/actions_mysql_gob/cgradmin.json b/data/conf/samples/actions_mysql_gob/cgradmin.json index 537529ad4..8c3699755 100644 --- a/data/conf/samples/actions_mysql_gob/cgradmin.json +++ b/data/conf/samples/actions_mysql_gob/cgradmin.json @@ -5,11 +5,14 @@ // Starts rater, scheduler "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/analyzers/cgrates.json b/data/conf/samples/analyzers/cgrates.json index deab42fc5..462502973 100644 --- a/data/conf/samples/analyzers/cgrates.json +++ b/data/conf/samples/analyzers/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/analyzers_doc/cgrates.json b/data/conf/samples/analyzers_doc/cgrates.json index 96a372250..8ba034963 100644 --- a/data/conf/samples/analyzers_doc/cgrates.json +++ b/data/conf/samples/analyzers_doc/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/apis_actions_internal/cgrates.json b/data/conf/samples/apis_actions_internal/cgrates.json index e2d2402ec..bd55ffb03 100644 --- a/data/conf/samples/apis_actions_internal/cgrates.json +++ b/data/conf/samples/apis_actions_internal/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/actions_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/apis_actions_mongo/cgrates.json b/data/conf/samples/apis_actions_mongo/cgrates.json index 329a7016f..b4a130f25 100644 --- a/data/conf/samples/apis_actions_mongo/cgrates.json +++ b/data/conf/samples/apis_actions_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/actions_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/apis_actions_mysql/cgrates.json b/data/conf/samples/apis_actions_mysql/cgrates.json index 18c6cf11d..e5dbcfaaf 100644 --- a/data/conf/samples/apis_actions_mysql/cgrates.json +++ b/data/conf/samples/apis_actions_mysql/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/apis_chargers_mongo/cgrates.json b/data/conf/samples/apis_chargers_mongo/cgrates.json index e8d3b5d3d..ddaae3679 100644 --- a/data/conf/samples/apis_chargers_mongo/cgrates.json +++ b/data/conf/samples/apis_chargers_mongo/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/apis_chargers_mysql/cgrates.json b/data/conf/samples/apis_chargers_mysql/cgrates.json index 6014c7fb9..eb57f5242 100644 --- a/data/conf/samples/apis_chargers_mysql/cgrates.json +++ b/data/conf/samples/apis_chargers_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/apis_config_mongo/cgrates.json b/data/conf/samples/apis_config_mongo/cgrates.json index 39c74a3cc..0d4c68c21 100644 --- a/data/conf/samples/apis_config_mongo/cgrates.json +++ b/data/conf/samples/apis_config_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/apis_config_mysql/cgrates.json b/data/conf/samples/apis_config_mysql/cgrates.json index a885f9a26..b60cb093e 100644 --- a/data/conf/samples/apis_config_mysql/cgrates.json +++ b/data/conf/samples/apis_config_mysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/apis_loaders_internal/cgrates.json b/data/conf/samples/apis_loaders_internal/cgrates.json index 4b416cf35..9a65c7e2a 100644 --- a/data/conf/samples/apis_loaders_internal/cgrates.json +++ b/data/conf/samples/apis_loaders_internal/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/loaders_it_test.go -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/apis_loaders_mongo/cgrates.json b/data/conf/samples/apis_loaders_mongo/cgrates.json index 978c9e827..714c14811 100644 --- a/data/conf/samples/apis_loaders_mongo/cgrates.json +++ b/data/conf/samples/apis_loaders_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/loaders_it_test.go -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/apis_loaders_mysql/cgrates.json b/data/conf/samples/apis_loaders_mysql/cgrates.json index 3b35fa765..2092158f0 100644 --- a/data/conf/samples/apis_loaders_mysql/cgrates.json +++ b/data/conf/samples/apis_loaders_mysql/cgrates.json @@ -1,8 +1,8 @@ { // CGRateS Configuration file // will be used in apis/loaders_it_test.go -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) diff --git a/data/conf/samples/apis_srvmng_internal/cgrates.json b/data/conf/samples/apis_srvmng_internal/cgrates.json index 787d33aea..2ec76aaa9 100644 --- a/data/conf/samples/apis_srvmng_internal/cgrates.json +++ b/data/conf/samples/apis_srvmng_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/apis_srvmng_mongo/cgrates.json b/data/conf/samples/apis_srvmng_mongo/cgrates.json index f9793574c..c99eb6bed 100644 --- a/data/conf/samples/apis_srvmng_mongo/cgrates.json +++ b/data/conf/samples/apis_srvmng_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/apis_srvmng_mysql/cgrates.json b/data/conf/samples/apis_srvmng_mysql/cgrates.json index 0e32bde16..8849348f3 100644 --- a/data/conf/samples/apis_srvmng_mysql/cgrates.json +++ b/data/conf/samples/apis_srvmng_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/attr_test_internal/cgrates.json b/data/conf/samples/attr_test_internal/cgrates.json index 3bac7684b..a1bef22bc 100644 --- a/data/conf/samples/attr_test_internal/cgrates.json +++ b/data/conf/samples/attr_test_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/attr_test_mongo/cgrates.json b/data/conf/samples/attr_test_mongo/cgrates.json index deee36629..2b3090f8a 100644 --- a/data/conf/samples/attr_test_mongo/cgrates.json +++ b/data/conf/samples/attr_test_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/attr_test_mysql/cgrates.json b/data/conf/samples/attr_test_mysql/cgrates.json index 13d783bcf..db7139a82 100644 --- a/data/conf/samples/attr_test_mysql/cgrates.json +++ b/data/conf/samples/attr_test_mysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/attributes_mysql/cgrates.json b/data/conf/samples/attributes_mysql/cgrates.json index 77216fc56..286472c1f 100644 --- a/data/conf/samples/attributes_mysql/cgrates.json +++ b/data/conf/samples/attributes_mysql/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/attributes_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) diff --git a/data/conf/samples/attributesindexes_mongo/cgrates.json b/data/conf/samples/attributesindexes_mongo/cgrates.json index e7c1e1f8b..e09a81c64 100644 --- a/data/conf/samples/attributesindexes_mongo/cgrates.json +++ b/data/conf/samples/attributesindexes_mongo/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/attributesindexes_mysql/cgrates.json b/data/conf/samples/attributesindexes_mysql/cgrates.json index b973c0c8e..6ec21f715 100644 --- a/data/conf/samples/attributesindexes_mysql/cgrates.json +++ b/data/conf/samples/attributesindexes_mysql/cgrates.json @@ -2,9 +2,9 @@ // CGRateS Configuration file // used in general_tests/attributes_filters_index_it_test.go -"general": { - "log_level": 7, -}, +"logger": { + "level": 7 +}, "stor_db": { "db_password": "CGRateS.org" diff --git a/data/conf/samples/cache_replicate/dispatcher_engine/cgrates.json b/data/conf/samples/cache_replicate/dispatcher_engine/cgrates.json index 70281a075..f6eefd14a 100644 --- a/data/conf/samples/cache_replicate/dispatcher_engine/cgrates.json +++ b/data/conf/samples/cache_replicate/dispatcher_engine/cgrates.json @@ -2,10 +2,13 @@ "general": { "node_id": "DispatcherEngine", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, + "stor_db": { "db_type": "*internal" }, diff --git a/data/conf/samples/cache_replicate/dispatcher_engine2/cgrates.json b/data/conf/samples/cache_replicate/dispatcher_engine2/cgrates.json index 0ea050511..a1e9cae18 100644 --- a/data/conf/samples/cache_replicate/dispatcher_engine2/cgrates.json +++ b/data/conf/samples/cache_replicate/dispatcher_engine2/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherEngine2", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":3012", diff --git a/data/conf/samples/cache_replicate/engine1/cgrates.json b/data/conf/samples/cache_replicate/engine1/cgrates.json index 28567141b..311cfd82b 100644 --- a/data/conf/samples/cache_replicate/engine1/cgrates.json +++ b/data/conf/samples/cache_replicate/engine1/cgrates.json @@ -5,9 +5,11 @@ "general": { "node_id": "Engine1", - "log_level": 7 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":6012", diff --git a/data/conf/samples/cache_replicate/fltr_update_e1_mongo/cgrates.json b/data/conf/samples/cache_replicate/fltr_update_e1_mongo/cgrates.json index 191747eb3..d7cbe23c6 100644 --- a/data/conf/samples/cache_replicate/fltr_update_e1_mongo/cgrates.json +++ b/data/conf/samples/cache_replicate/fltr_update_e1_mongo/cgrates.json @@ -4,10 +4,12 @@ "general": { "node_id": "fltr_update_e1_mongo", - "log_level": 7 }, - + "logger": { + "level": 7 + }, + "listen": { "rpc_json": ":22012", "rpc_gob": ":22013", diff --git a/data/conf/samples/cache_replicate/fltr_update_e1_mysql/cgrates.json b/data/conf/samples/cache_replicate/fltr_update_e1_mysql/cgrates.json index ecc92ea3b..fcea44f61 100644 --- a/data/conf/samples/cache_replicate/fltr_update_e1_mysql/cgrates.json +++ b/data/conf/samples/cache_replicate/fltr_update_e1_mysql/cgrates.json @@ -5,9 +5,11 @@ "general": { "node_id": "fltr_update_e1_mysql", - "log_level": 7 }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":22012", diff --git a/data/conf/samples/cache_rpl_active_active/dispatcher_engine/cgrates.json b/data/conf/samples/cache_rpl_active_active/dispatcher_engine/cgrates.json index 0bf814aac..7e24d2ec0 100644 --- a/data/conf/samples/cache_rpl_active_active/dispatcher_engine/cgrates.json +++ b/data/conf/samples/cache_rpl_active_active/dispatcher_engine/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherEngine", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/cache_rpl_active_active/dispatcher_engine2/cgrates.json b/data/conf/samples/cache_rpl_active_active/dispatcher_engine2/cgrates.json index 4486873d3..585d44c15 100644 --- a/data/conf/samples/cache_rpl_active_active/dispatcher_engine2/cgrates.json +++ b/data/conf/samples/cache_rpl_active_active/dispatcher_engine2/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherEngine2", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":3012", diff --git a/data/conf/samples/cache_rpl_active_active/engine1/cgrates.json b/data/conf/samples/cache_rpl_active_active/engine1/cgrates.json index f9677947d..a67fca624 100644 --- a/data/conf/samples/cache_rpl_active_active/engine1/cgrates.json +++ b/data/conf/samples/cache_rpl_active_active/engine1/cgrates.json @@ -5,9 +5,11 @@ "general": { "node_id": "Engine1", - "log_level": 7 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":6012", diff --git a/data/conf/samples/caps_queue/cgrates.json b/data/conf/samples/caps_queue/cgrates.json index 909493044..5c1224cf9 100644 --- a/data/conf/samples/caps_queue/cgrates.json +++ b/data/conf/samples/caps_queue/cgrates.json @@ -1,11 +1,13 @@ { "general": { - "log_level": 7, "node_id": "ConcurrentQueueEngine", "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "cores": { "caps": 2, diff --git a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json index 7221edd03..6e12b5202 100644 --- a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json @@ -5,11 +5,14 @@ // Starts rater, cdrs and mediator connecting over internal channel "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "data_db": { "db_type": "mongo", "db_name": "10", diff --git a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json index c98f11e3e..248aa6745 100644 --- a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json @@ -5,11 +5,14 @@ // Starts rater, cdrs and mediator connecting over internal channel "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "data_db": { "db_type": "redis", "db_port": 6379, diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index b145dfe5d..90742985d 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -4,11 +4,14 @@ // Used in general_tests "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "data_db":{ "db_type": "*internal" }, diff --git a/data/conf/samples/cdrsv1processeventmongo/cgrates.json b/data/conf/samples/cdrsv1processeventmongo/cgrates.json index 377920b3f..665998a76 100644 --- a/data/conf/samples/cdrsv1processeventmongo/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmongo/cgrates.json @@ -4,11 +4,14 @@ // Used in general_tests "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "data_db": { "db_type": "mongo", "db_name": "10", diff --git a/data/conf/samples/cdrsv1processeventmysql/cgrates.json b/data/conf/samples/cdrsv1processeventmysql/cgrates.json index 91ff5234b..616dc4b65 100644 --- a/data/conf/samples/cdrsv1processeventmysql/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmysql/cgrates.json @@ -4,11 +4,14 @@ // Used in general_tests "general": { - "log_level": 7, "poster_attempts": 1, "failed_posts_ttl": "1", }, +"logger": { + "level": 7 +}, + "data_db": { // database used to store runtime data (eg: accounts, cdr stats) "db_type": "redis", // data_db type: "db_port": 6379, // data_db port to reach the database diff --git a/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json b/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json index 52678eff1..7db87a2a8 100644 --- a/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json +++ b/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "stor_db": { diff --git a/data/conf/samples/cdrsv_failover_internal/cgrates.json b/data/conf/samples/cdrsv_failover_internal/cgrates.json index b89148fea..17c0bbeab 100644 --- a/data/conf/samples/cdrsv_failover_internal/cgrates.json +++ b/data/conf/samples/cdrsv_failover_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "TestFailCDRS" }, +"logger": { + "level": 7 +}, + "data_db": { "db_type": "*internal" }, diff --git a/data/conf/samples/cdrsv_failover_mongo/cgrates.json b/data/conf/samples/cdrsv_failover_mongo/cgrates.json index 8cbb42d2d..8c6e934a3 100644 --- a/data/conf/samples/cdrsv_failover_mongo/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "TestFailCDRS" }, +"logger": { + "level": 7 +}, + "efs": { "enabled": true, "poster_attempts": 1, diff --git a/data/conf/samples/cdrsv_failover_mysql/cgrates.json b/data/conf/samples/cdrsv_failover_mysql/cgrates.json index ef45ef22d..f8370f780 100644 --- a/data/conf/samples/cdrsv_failover_mysql/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mysql/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, cdrs and mediator connecting over internal channel "general": { - "log_level": 7, "node_id": "TestFailCDRS", }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/cfg_rld_rates_internal/cgrates.json b/data/conf/samples/cfg_rld_rates_internal/cgrates.json index f9457ee09..6fbf2f183 100644 --- a/data/conf/samples/cfg_rld_rates_internal/cgrates.json +++ b/data/conf/samples/cfg_rld_rates_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/cfg_rld_rates_mongo/cgrates.json b/data/conf/samples/cfg_rld_rates_mongo/cgrates.json index cb44d1780..93b500e9a 100644 --- a/data/conf/samples/cfg_rld_rates_mongo/cgrates.json +++ b/data/conf/samples/cfg_rld_rates_mongo/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/cfg_rld_rates_mysql/cgrates.json b/data/conf/samples/cfg_rld_rates_mysql/cgrates.json index 1567cedc0..21a8738b9 100644 --- a/data/conf/samples/cfg_rld_rates_mysql/cgrates.json +++ b/data/conf/samples/cfg_rld_rates_mysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/core_config/cgrates.json b/data/conf/samples/core_config/cgrates.json index a260f6ba5..52c181e2d 100644 --- a/data/conf/samples/core_config/cgrates.json +++ b/data/conf/samples/core_config/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "Cores_apis_test", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/dataconverter_internal/cgrates.json b/data/conf/samples/dataconverter_internal/cgrates.json index b5a08cf0b..cc089cba2 100644 --- a/data/conf/samples/dataconverter_internal/cgrates.json +++ b/data/conf/samples/dataconverter_internal/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/dataconverter_mongo/cgrates.json b/data/conf/samples/dataconverter_mongo/cgrates.json index 3b1babb32..c99175440 100644 --- a/data/conf/samples/dataconverter_mongo/cgrates.json +++ b/data/conf/samples/dataconverter_mongo/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/dataconverter_mysql/cgrates.json b/data/conf/samples/dataconverter_mysql/cgrates.json index 24e29dd02..84f8e45c0 100644 --- a/data/conf/samples/dataconverter_mysql/cgrates.json +++ b/data/conf/samples/dataconverter_mysql/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/diamagent_internal/cgrates.json b/data/conf/samples/diamagent_internal/cgrates.json index 145145aec..f0c1b6e8b 100644 --- a/data/conf/samples/diamagent_internal/cgrates.json +++ b/data/conf/samples/diamagent_internal/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json b/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json index 9506ee5ba..25c3b87a4 100644 --- a/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json +++ b/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json b/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json index ca061c7d9..bfc831384 100644 --- a/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json +++ b/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_mongo/cgrates.json b/data/conf/samples/diamagent_mongo/cgrates.json index e6379af97..a5f5f02fa 100644 --- a/data/conf/samples/diamagent_mongo/cgrates.json +++ b/data/conf/samples/diamagent_mongo/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_mongo_gobbirpc/cgrates.json b/data/conf/samples/diamagent_mongo_gobbirpc/cgrates.json index a29183888..abf9144ee 100644 --- a/data/conf/samples/diamagent_mongo_gobbirpc/cgrates.json +++ b/data/conf/samples/diamagent_mongo_gobbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_mongo_jsonbirpc/cgrates.json b/data/conf/samples/diamagent_mongo_jsonbirpc/cgrates.json index 0f82c45c3..16bb68067 100644 --- a/data/conf/samples/diamagent_mongo_jsonbirpc/cgrates.json +++ b/data/conf/samples/diamagent_mongo_jsonbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_mysql/cgrates.json b/data/conf/samples/diamagent_mysql/cgrates.json index 08e20c5f7..90e5b5be5 100644 --- a/data/conf/samples/diamagent_mysql/cgrates.json +++ b/data/conf/samples/diamagent_mysql/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/diamagent_mysql_gobbirpc/cgrates.json b/data/conf/samples/diamagent_mysql_gobbirpc/cgrates.json index f393b4df5..d67320bcc 100644 --- a/data/conf/samples/diamagent_mysql_gobbirpc/cgrates.json +++ b/data/conf/samples/diamagent_mysql_gobbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamagent_mysql_jsonbirpc/cgrates.json b/data/conf/samples/diamagent_mysql_jsonbirpc/cgrates.json index 23dfea207..136ef7618 100644 --- a/data/conf/samples/diamagent_mysql_jsonbirpc/cgrates.json +++ b/data/conf/samples/diamagent_mysql_jsonbirpc/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamsctpagent_internal/cgrates.json b/data/conf/samples/diamsctpagent_internal/cgrates.json index 8796b435f..e596e657e 100755 --- a/data/conf/samples/diamsctpagent_internal/cgrates.json +++ b/data/conf/samples/diamsctpagent_internal/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamsctpagent_mongo/cgrates.json b/data/conf/samples/diamsctpagent_mongo/cgrates.json index 882872758..034255f7a 100755 --- a/data/conf/samples/diamsctpagent_mongo/cgrates.json +++ b/data/conf/samples/diamsctpagent_mongo/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/diamsctpagent_mysql/cgrates.json b/data/conf/samples/diamsctpagent_mysql/cgrates.json index 6968bcab3..92cfb40b4 100755 --- a/data/conf/samples/diamsctpagent_mysql/cgrates.json +++ b/data/conf/samples/diamsctpagent_mysql/cgrates.json @@ -5,10 +5,13 @@ // Starts rater, scheduler "general": { - "log_level": 7, "default_tenant": "cgrates.com", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/dispatcher_opts/cgrates.json b/data/conf/samples/dispatcher_opts/cgrates.json index 06c99eb81..81e3927f1 100644 --- a/data/conf/samples/dispatcher_opts/cgrates.json +++ b/data/conf/samples/dispatcher_opts/cgrates.json @@ -2,9 +2,12 @@ "general": { "node_id": "HOST1", - "log_level": 7 }, - + +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/dispatcher_opts_admin/cgrates.json b/data/conf/samples/dispatcher_opts_admin/cgrates.json index f4e8c9d9b..c9ac6b933 100644 --- a/data/conf/samples/dispatcher_opts_admin/cgrates.json +++ b/data/conf/samples/dispatcher_opts_admin/cgrates.json @@ -2,9 +2,12 @@ "general": { "node_id": "HOST2", - "log_level": 7 }, - + +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":4012", "rpc_gob": ":4013", diff --git a/data/conf/samples/dispatchers/all/cgrates.json b/data/conf/samples/dispatchers/all/cgrates.json index b796bf0da..3425e1b03 100644 --- a/data/conf/samples/dispatchers/all/cgrates.json +++ b/data/conf/samples/dispatchers/all/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/dispatchers/all2/cgrates.json b/data/conf/samples/dispatchers/all2/cgrates.json index 30dc6f361..7f804cb22 100644 --- a/data/conf/samples/dispatchers/all2/cgrates.json +++ b/data/conf/samples/dispatchers/all2/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL2", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/dispatchers/all2_mongo/cgrates.json b/data/conf/samples/dispatchers/all2_mongo/cgrates.json index 31c9cd704..fd878c9578 100644 --- a/data/conf/samples/dispatchers/all2_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/all2_mongo/cgrates.json @@ -2,9 +2,11 @@ "general": { "node_id": "ALL2", - "log_level": 7 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":7012", diff --git a/data/conf/samples/dispatchers/all2_mysql/cgrates.json b/data/conf/samples/dispatchers/all2_mysql/cgrates.json index fe0a9cf9e..b6d02788b 100644 --- a/data/conf/samples/dispatchers/all2_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/all2_mysql/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL2", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/dispatchers/all_mongo/cgrates.json b/data/conf/samples/dispatchers/all_mongo/cgrates.json index 06dcd5344..899476ef7 100644 --- a/data/conf/samples/dispatchers/all_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/all_mongo/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/dispatchers/all_mysql/cgrates.json b/data/conf/samples/dispatchers/all_mysql/cgrates.json index dbd91bf6e..d46c8ca6e 100644 --- a/data/conf/samples/dispatchers/all_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/all_mysql/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/dispatchers/diamagent/cgrates.json b/data/conf/samples/dispatchers/diamagent/cgrates.json index 071422a23..623bd47e4 100644 --- a/data/conf/samples/dispatchers/diamagent/cgrates.json +++ b/data/conf/samples/dispatchers/diamagent/cgrates.json @@ -6,10 +6,13 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1 }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json index 7bca2581d..d14262ad0 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json index 26e788f6d..2247a6a5f 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json @@ -8,9 +8,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, + + "logger": { + "level": 7 + }, "listen": { diff --git a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json index 7e78df9b0..bbd8cd417 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json @@ -8,10 +8,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json index 8a137a62d..deda48181 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json @@ -8,10 +8,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json index 7ae90cd27..40d7b45a9 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json @@ -2,10 +2,13 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1 }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json index 38a8d55de..168461e88 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json @@ -8,10 +8,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json index 282037eed..f483b3d4e 100755 --- a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json @@ -2,10 +2,13 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1 }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/dispatchers/radagent/cgrates.json b/data/conf/samples/dispatchers/radagent/cgrates.json index 31f1b228b..32a5f57bf 100644 --- a/data/conf/samples/dispatchers/radagent/cgrates.json +++ b/data/conf/samples/dispatchers/radagent/cgrates.json @@ -4,10 +4,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1, }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", // RPC JSON listening address diff --git a/data/conf/samples/dnsagent_internal/cgrates.json b/data/conf/samples/dnsagent_internal/cgrates.json index 0e061d041..0a37ae5d3 100644 --- a/data/conf/samples/dnsagent_internal/cgrates.json +++ b/data/conf/samples/dnsagent_internal/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/dnsagent_mongo/cgrates.json b/data/conf/samples/dnsagent_mongo/cgrates.json index 345663abd..6d3724d62 100644 --- a/data/conf/samples/dnsagent_mongo/cgrates.json +++ b/data/conf/samples/dnsagent_mongo/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. -"general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/dnsagent_mysql/cgrates.json b/data/conf/samples/dnsagent_mysql/cgrates.json index 54988625f..650a341fc 100644 --- a/data/conf/samples/dnsagent_mysql/cgrates.json +++ b/data/conf/samples/dnsagent_mysql/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. -"general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) +"logger": { + "level": 7 }, "stor_db": { diff --git a/data/conf/samples/dnsagent_reload/cgrates.json b/data/conf/samples/dnsagent_reload/cgrates.json index 124477cd4..05a19fb9f 100644 --- a/data/conf/samples/dnsagent_reload/cgrates.json +++ b/data/conf/samples/dnsagent_reload/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. - "general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) + "logger": { + "level": 7 }, diff --git a/data/conf/samples/docker/cgrates.json b/data/conf/samples/docker/cgrates.json index fd25be9f4..47b1cae7a 100644 --- a/data/conf/samples/docker/cgrates.json +++ b/data/conf/samples/docker/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": "*env:DOCKER_IP:2012", // RPC JSON listening address diff --git a/data/conf/samples/ees_blocker_internal/cgrates.json b/data/conf/samples/ees_blocker_internal/cgrates.json index 4eb90d541..7e633ab1e 100644 --- a/data/conf/samples/ees_blocker_internal/cgrates.json +++ b/data/conf/samples/ees_blocker_internal/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/ees_blocker_mongo/cgrates.json b/data/conf/samples/ees_blocker_mongo/cgrates.json index bb804a3a0..aa576339d 100644 --- a/data/conf/samples/ees_blocker_mongo/cgrates.json +++ b/data/conf/samples/ees_blocker_mongo/cgrates.json @@ -1,7 +1,7 @@ { - "general": { - "log_level": 7 + "logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/ees_blocker_mysql/cgrates.json b/data/conf/samples/ees_blocker_mysql/cgrates.json index eadaa71ce..47fdaa8fd 100644 --- a/data/conf/samples/ees_blocker_mysql/cgrates.json +++ b/data/conf/samples/ees_blocker_mysql/cgrates.json @@ -1,7 +1,7 @@ { - "general": { - "log_level": 7 + "logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/ees_cloud/cgrates.json b/data/conf/samples/ees_cloud/cgrates.json index 35b01537f..b27dfb380 100644 --- a/data/conf/samples/ees_cloud/cgrates.json +++ b/data/conf/samples/ees_cloud/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "poster_attempts": 2, "failed_posts_ttl": "1s" }, +"logger": { + "level": 7 +}, + "data_db": { "db_type": "*internal" }, diff --git a/data/conf/samples/ers_example/cgrates.json b/data/conf/samples/ers_example/cgrates.json index 5fd1f8f53..d238c3f6f 100644 --- a/data/conf/samples/ers_example/cgrates.json +++ b/data/conf/samples/ers_example/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index 0928721e5..6691af337 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "reply_timeout": "10s", "default_timezone": "UTC" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index a3ee2e70c..cea058706 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "reply_timeout": "10s", "default_timezone": "UTC" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index 6871d4d43..abf39d287 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "reply_timeout": "10s", "default_timezone": "UTC" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/ers_nats/cgrates.json b/data/conf/samples/ers_nats/cgrates.json index 2a35385d7..931d00786 100644 --- a/data/conf/samples/ers_nats/cgrates.json +++ b/data/conf/samples/ers_nats/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index cd7ecfe0d..b52249c34 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "reply_timeout": "10s", "default_timezone": "UTC" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/ers_reload/disabled/cgrates.json b/data/conf/samples/ers_reload/disabled/cgrates.json index 4d9b7d4d3..a469a5437 100644 --- a/data/conf/samples/ers_reload/disabled/cgrates.json +++ b/data/conf/samples/ers_reload/disabled/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/disabled_internal/cgrates.json b/data/conf/samples/ers_reload/disabled_internal/cgrates.json index fa6340f1a..2f36f387d 100644 --- a/data/conf/samples/ers_reload/disabled_internal/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_internal/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/disabled_mongo/cgrates.json b/data/conf/samples/ers_reload/disabled_mongo/cgrates.json index 936885c71..6fef8678e 100644 --- a/data/conf/samples/ers_reload/disabled_mongo/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_mongo/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/disabled_mysql/cgrates.json b/data/conf/samples/ers_reload/disabled_mysql/cgrates.json index a1e5fd424..9aea56746 100644 --- a/data/conf/samples/ers_reload/disabled_mysql/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_mysql/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/disabled_postgres/cgrates.json b/data/conf/samples/ers_reload/disabled_postgres/cgrates.json index a1e5fd424..9aea56746 100644 --- a/data/conf/samples/ers_reload/disabled_postgres/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_postgres/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/first_reload/cgrates.json b/data/conf/samples/ers_reload/first_reload/cgrates.json index 15436b456..e06f67f9e 100644 --- a/data/conf/samples/ers_reload/first_reload/cgrates.json +++ b/data/conf/samples/ers_reload/first_reload/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/internal/cgrates.json b/data/conf/samples/ers_reload/internal/cgrates.json index a78c80070..74a817ef2 100644 --- a/data/conf/samples/ers_reload/internal/cgrates.json +++ b/data/conf/samples/ers_reload/internal/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests - "general": { - "log_level": 7, + "logger": { + "level": 7 }, diff --git a/data/conf/samples/ers_reload/second_reload/cgrates.json b/data/conf/samples/ers_reload/second_reload/cgrates.json index e8311a98b..dc308ecbb 100644 --- a/data/conf/samples/ers_reload/second_reload/cgrates.json +++ b/data/conf/samples/ers_reload/second_reload/cgrates.json @@ -4,8 +4,8 @@ // Used for SessionSv1 integration tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/export_it_test_internal/cgrates.json b/data/conf/samples/export_it_test_internal/cgrates.json index aa5641a3e..63fdbdbe3 100644 --- a/data/conf/samples/export_it_test_internal/cgrates.json +++ b/data/conf/samples/export_it_test_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, - + + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/export_it_test_mongo/cgrates.json b/data/conf/samples/export_it_test_mongo/cgrates.json index f24431b87..20049503b 100644 --- a/data/conf/samples/export_it_test_mongo/cgrates.json +++ b/data/conf/samples/export_it_test_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/export_it_test_mysql/cgrates.json b/data/conf/samples/export_it_test_mysql/cgrates.json index 186196c05..002f17f1b 100644 --- a/data/conf/samples/export_it_test_mysql/cgrates.json +++ b/data/conf/samples/export_it_test_mysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/filter_indexes_internal/cgrates.json b/data/conf/samples/filter_indexes_internal/cgrates.json index 84190ee40..1184c4886 100644 --- a/data/conf/samples/filter_indexes_internal/cgrates.json +++ b/data/conf/samples/filter_indexes_internal/cgrates.json @@ -2,9 +2,9 @@ // CGRateS Configuration file // will be used in apis/filter_indexes_it_test.go - "general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) - }, + "logger": { + "level": 7 +}, "data_db": { "db_type": "*internal", diff --git a/data/conf/samples/filter_indexes_mongo/cgrates.json b/data/conf/samples/filter_indexes_mongo/cgrates.json index 6476e1049..86b554df7 100644 --- a/data/conf/samples/filter_indexes_mongo/cgrates.json +++ b/data/conf/samples/filter_indexes_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/filter_indexes_it_test.go - "general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/filter_indexes_mysql/cgrates.json b/data/conf/samples/filter_indexes_mysql/cgrates.json index aca2e346d..7a44dd3a6 100644 --- a/data/conf/samples/filter_indexes_mysql/cgrates.json +++ b/data/conf/samples/filter_indexes_mysql/cgrates.json @@ -2,9 +2,9 @@ // CGRateS Configuration file // will be used in apis/filter_indexes_it_test.go - "general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) - }, + "logger": { + "level": 7 +}, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) "db_type": "redis", // data_db type: diff --git a/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json b/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json index e5ca741e5..a61f5a071 100644 --- a/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json +++ b/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "node_id" : "EngineMongo1" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2022", "rpc_gob": ":2023", diff --git a/data/conf/samples/filtered_replication/engine1_redis/cgrates.json b/data/conf/samples/filtered_replication/engine1_redis/cgrates.json index 1899a1a33..02fa6f4e1 100644 --- a/data/conf/samples/filtered_replication/engine1_redis/cgrates.json +++ b/data/conf/samples/filtered_replication/engine1_redis/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id" : "EngineMongo1" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2022", "rpc_gob": ":2023", diff --git a/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json b/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json index f29dd7552..86c1eb317 100644 --- a/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json +++ b/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id" : "EngineMongo2" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2032", "rpc_gob": ":2033", diff --git a/data/conf/samples/filtered_replication/engine2_redis/cgrates.json b/data/conf/samples/filtered_replication/engine2_redis/cgrates.json index 1bbc101e2..45729b1c0 100644 --- a/data/conf/samples/filtered_replication/engine2_redis/cgrates.json +++ b/data/conf/samples/filtered_replication/engine2_redis/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id" : "EngineMongo2" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2032", "rpc_gob": ":2033", diff --git a/data/conf/samples/filtered_replication/internal/cgrates.json b/data/conf/samples/filtered_replication/internal/cgrates.json index 7ab064ce1..81eaf5758 100644 --- a/data/conf/samples/filtered_replication/internal/cgrates.json +++ b/data/conf/samples/filtered_replication/internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "InternalEngine" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/filters/cgrates.json b/data/conf/samples/filters/cgrates.json index 0cd0f99a7..ff6e77a02 100644 --- a/data/conf/samples/filters/cgrates.json +++ b/data/conf/samples/filters/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "CGRFilterS" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/filters_gob/cgrates.json b/data/conf/samples/filters_gob/cgrates.json index e1b2bdffd..e0233db2e 100644 --- a/data/conf/samples/filters_gob/cgrates.json +++ b/data/conf/samples/filters_gob/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "CGRFilterS" }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/filters_internal/cgrates.json b/data/conf/samples/filters_internal/cgrates.json index af49a6a6d..679f38125 100644 --- a/data/conf/samples/filters_internal/cgrates.json +++ b/data/conf/samples/filters_internal/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "node_id": "CGRFilterS" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/filters_mongo/cgrates.json b/data/conf/samples/filters_mongo/cgrates.json index 47733351b..e92839a56 100644 --- a/data/conf/samples/filters_mongo/cgrates.json +++ b/data/conf/samples/filters_mongo/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "node_id": "CGRFilterS" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/filters_mysql/cgrates.json b/data/conf/samples/filters_mysql/cgrates.json index f9d7242f2..13f7e5979 100644 --- a/data/conf/samples/filters_mysql/cgrates.json +++ b/data/conf/samples/filters_mysql/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "node_id": "CGRFilterS" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/fltr_sep_internal/cgrates.json b/data/conf/samples/fltr_sep_internal/cgrates.json index 6ea9f463c..ad2fddecd 100644 --- a/data/conf/samples/fltr_sep_internal/cgrates.json +++ b/data/conf/samples/fltr_sep_internal/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/fltr_sep_mongo/cgrates.json b/data/conf/samples/fltr_sep_mongo/cgrates.json index 0caf09c53..2f409b0fc 100644 --- a/data/conf/samples/fltr_sep_mongo/cgrates.json +++ b/data/conf/samples/fltr_sep_mongo/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/fltr_sep_mysql/cgrates.json b/data/conf/samples/fltr_sep_mysql/cgrates.json index 6d8cb14bf..befc6985f 100644 --- a/data/conf/samples/fltr_sep_mysql/cgrates.json +++ b/data/conf/samples/fltr_sep_mysql/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/gocs/au_site/cgrates.json b/data/conf/samples/gocs/au_site/cgrates.json index 9754a4c43..6ff32956d 100644 --- a/data/conf/samples/gocs/au_site/cgrates.json +++ b/data/conf/samples/gocs/au_site/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "AU_SITE", }, + "logger": { + "level": 7 +}, + "listen": { "rpc_json": ":3012", "rpc_gob": ":3013", diff --git a/data/conf/samples/gocs/dsp_site/cgrates.json b/data/conf/samples/gocs/dsp_site/cgrates.json index 32f15da7d..188a60ca8 100644 --- a/data/conf/samples/gocs/dsp_site/cgrates.json +++ b/data/conf/samples/gocs/dsp_site/cgrates.json @@ -1,12 +1,14 @@ { "general": { - "log_level": 7, "node_id": "DISPATCH_SITE", "reconnects": 2, "reply_timeout": "5s", }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/gocs/us_site/cgrates.json b/data/conf/samples/gocs/us_site/cgrates.json index 0736ca4f5..05a5affd1 100644 --- a/data/conf/samples/gocs/us_site/cgrates.json +++ b/data/conf/samples/gocs/us_site/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "node_id": "US_SITE" }, + "logger": { + "level": 7 + }, + "listen": { "rpc_json": ":4012", "rpc_gob": ":4013", diff --git a/data/conf/samples/httpagent_mongo/cgrates.json b/data/conf/samples/httpagent_mongo/cgrates.json index a1602c1f3..6a4c28f68 100644 --- a/data/conf/samples/httpagent_mongo/cgrates.json +++ b/data/conf/samples/httpagent_mongo/cgrates.json @@ -1,8 +1,8 @@ { -"general": { - "log_level": 7 -}, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/internal_broadcast_replication/cgrates.json b/data/conf/samples/internal_broadcast_replication/cgrates.json index abd61e891..7a582ee3c 100644 --- a/data/conf/samples/internal_broadcast_replication/cgrates.json +++ b/data/conf/samples/internal_broadcast_replication/cgrates.json @@ -4,10 +4,13 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 + }, + "rpc_conns": { "broadcast_conn": { "strategy": "*broadcast", diff --git a/data/conf/samples/ld_process_match_rt_internal/cgrates.json b/data/conf/samples/ld_process_match_rt_internal/cgrates.json index 51cc573b6..1c034bd96 100644 --- a/data/conf/samples/ld_process_match_rt_internal/cgrates.json +++ b/data/conf/samples/ld_process_match_rt_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/ld_process_match_rt_mongo/cgrates.json b/data/conf/samples/ld_process_match_rt_mongo/cgrates.json index 76bc87ad3..5fd2891ee 100644 --- a/data/conf/samples/ld_process_match_rt_mongo/cgrates.json +++ b/data/conf/samples/ld_process_match_rt_mongo/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/ld_process_match_rt_mysql/cgrates.json b/data/conf/samples/ld_process_match_rt_mysql/cgrates.json index d7f8369e9..7d028d829 100644 --- a/data/conf/samples/ld_process_match_rt_mysql/cgrates.json +++ b/data/conf/samples/ld_process_match_rt_mysql/cgrates.json @@ -4,9 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, + + "logger": { + "level": 7 + }, "stor_db": { "db_password": "CGRateS.org" diff --git a/data/conf/samples/loader_mongo/cgrates.json b/data/conf/samples/loader_mongo/cgrates.json index e6eaf0697..1f7554620 100644 --- a/data/conf/samples/loader_mongo/cgrates.json +++ b/data/conf/samples/loader_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/loader_mysql/cgrates.json b/data/conf/samples/loader_mysql/cgrates.json index 289dbeb43..796bc865c 100644 --- a/data/conf/samples/loader_mysql/cgrates.json +++ b/data/conf/samples/loader_mysql/cgrates.json @@ -4,10 +4,13 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/loaders/tutinternal/cgrates.json b/data/conf/samples/loaders/tutinternal/cgrates.json index ed8b8e41b..d9696ca01 100644 --- a/data/conf/samples/loaders/tutinternal/cgrates.json +++ b/data/conf/samples/loaders/tutinternal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/loaders/tutmongo/cgrates.json b/data/conf/samples/loaders/tutmongo/cgrates.json index 756b0969f..f6753eff8 100644 --- a/data/conf/samples/loaders/tutmongo/cgrates.json +++ b/data/conf/samples/loaders/tutmongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/loaders/tutmysql/cgrates.json b/data/conf/samples/loaders/tutmysql/cgrates.json index 16120959d..5564e4eca 100644 --- a/data/conf/samples/loaders/tutmysql/cgrates.json +++ b/data/conf/samples/loaders/tutmysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/loaders_indexes_internal_db/cgrates.json b/data/conf/samples/loaders_indexes_internal_db/cgrates.json index c326a35bd..acb27fe21 100644 --- a/data/conf/samples/loaders_indexes_internal_db/cgrates.json +++ b/data/conf/samples/loaders_indexes_internal_db/cgrates.json @@ -1,7 +1,10 @@ { "general": { "node_id" : "IntenalLoaders", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/loaders_old2new_internal/cgrates.json b/data/conf/samples/loaders_old2new_internal/cgrates.json index 8a634607e..723262fbe 100644 --- a/data/conf/samples/loaders_old2new_internal/cgrates.json +++ b/data/conf/samples/loaders_old2new_internal/cgrates.json @@ -1,10 +1,11 @@ { "general": { - "log_level": 7, "reply_timeout": "30s", }, - +"logger": { + "level": 7 +}, "data_db": { "db_type": "*internal", diff --git a/data/conf/samples/loaders_old2new_mongo/cgrates.json b/data/conf/samples/loaders_old2new_mongo/cgrates.json index 317b67ef5..a36279521 100644 --- a/data/conf/samples/loaders_old2new_mongo/cgrates.json +++ b/data/conf/samples/loaders_old2new_mongo/cgrates.json @@ -1,9 +1,11 @@ { "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "mongo", diff --git a/data/conf/samples/loaders_old2new_mysql/cgrates.json b/data/conf/samples/loaders_old2new_mysql/cgrates.json index 40bc569db..5a6add7b1 100644 --- a/data/conf/samples/loaders_old2new_mysql/cgrates.json +++ b/data/conf/samples/loaders_old2new_mysql/cgrates.json @@ -1,9 +1,11 @@ { "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "redis", diff --git a/data/conf/samples/precache/tutmongo/cgrates.json b/data/conf/samples/precache/tutmongo/cgrates.json index 7152105c9..483a47478 100644 --- a/data/conf/samples/precache/tutmongo/cgrates.json +++ b/data/conf/samples/precache/tutmongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/precache/tutmongo_apiban/cgrates.json b/data/conf/samples/precache/tutmongo_apiban/cgrates.json index 8b2e17775..4d364acca 100644 --- a/data/conf/samples/precache/tutmongo_apiban/cgrates.json +++ b/data/conf/samples/precache/tutmongo_apiban/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/preload_internal/cgrates.json b/data/conf/samples/preload_internal/cgrates.json index 763a10daa..b8268bfa8 100644 --- a/data/conf/samples/preload_internal/cgrates.json +++ b/data/conf/samples/preload_internal/cgrates.json @@ -2,9 +2,9 @@ // CGRateS Configuration file // used for apis/preload_it_test.go - "general": { - "log_level": 7, - }, + "logger": { + "level": 7 + }, "data_db": { "db_type": "*internal" diff --git a/data/conf/samples/radagent_internal/cgrates.json b/data/conf/samples/radagent_internal/cgrates.json index 71e74beae..ed70b82f3 100644 --- a/data/conf/samples/radagent_internal/cgrates.json +++ b/data/conf/samples/radagent_internal/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/radagent_internal_gob/cgrates.json b/data/conf/samples/radagent_internal_gob/cgrates.json index acf6687bc..8008af71a 100644 --- a/data/conf/samples/radagent_internal_gob/cgrates.json +++ b/data/conf/samples/radagent_internal_gob/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/radagent_mongo/cgrates.json b/data/conf/samples/radagent_mongo/cgrates.json index 32fe6b635..39b4281ba 100644 --- a/data/conf/samples/radagent_mongo/cgrates.json +++ b/data/conf/samples/radagent_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/radagent_mongo_gob/cgrates.json b/data/conf/samples/radagent_mongo_gob/cgrates.json index ce033705e..1c51cb28a 100644 --- a/data/conf/samples/radagent_mongo_gob/cgrates.json +++ b/data/conf/samples/radagent_mongo_gob/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/radagent_mysql/cgrates.json b/data/conf/samples/radagent_mysql/cgrates.json index 1cfe4022b..518487b30 100644 --- a/data/conf/samples/radagent_mysql/cgrates.json +++ b/data/conf/samples/radagent_mysql/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/radagent_mysql_gob/cgrates.json b/data/conf/samples/radagent_mysql_gob/cgrates.json index ee801a616..d8d2a3c80 100644 --- a/data/conf/samples/radagent_mysql_gob/cgrates.json +++ b/data/conf/samples/radagent_mysql_gob/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // -"general": { - "log_level": 7, +"logger": { + "level": 7 }, diff --git a/data/conf/samples/rates_mysql/cgrates.json b/data/conf/samples/rates_mysql/cgrates.json index 07b8c10d3..b561b96fc 100644 --- a/data/conf/samples/rates_mysql/cgrates.json +++ b/data/conf/samples/rates_mysql/cgrates.json @@ -1,8 +1,11 @@ { "general": { - "node_id": "id", - "log_level": 7 + "node_id": "id", +}, + +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/registrarc/all2_mongo/cgrates.json b/data/conf/samples/registrarc/all2_mongo/cgrates.json index 149e1cb1c..725c17fdf 100644 --- a/data/conf/samples/registrarc/all2_mongo/cgrates.json +++ b/data/conf/samples/registrarc/all2_mongo/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL2", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/registrarc/all2_mysql/cgrates.json b/data/conf/samples/registrarc/all2_mysql/cgrates.json index bddb02366..a92dcfca3 100644 --- a/data/conf/samples/registrarc/all2_mysql/cgrates.json +++ b/data/conf/samples/registrarc/all2_mysql/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL2", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/registrarc/all_mongo/cgrates.json b/data/conf/samples/registrarc/all_mongo/cgrates.json index 3282f7521..de3a6104c 100644 --- a/data/conf/samples/registrarc/all_mongo/cgrates.json +++ b/data/conf/samples/registrarc/all_mongo/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/registrarc/all_mysql/cgrates.json b/data/conf/samples/registrarc/all_mysql/cgrates.json index c44ab2dec..e1ab40487 100644 --- a/data/conf/samples/registrarc/all_mysql/cgrates.json +++ b/data/conf/samples/registrarc/all_mysql/cgrates.json @@ -2,7 +2,10 @@ "general": { "node_id": "ALL", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/registrarc/dispatchers_mongo/cgrates.json b/data/conf/samples/registrarc/dispatchers_mongo/cgrates.json index 145099c16..b73a09185 100644 --- a/data/conf/samples/registrarc/dispatchers_mongo/cgrates.json +++ b/data/conf/samples/registrarc/dispatchers_mongo/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json b/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json index 992e48c36..fb2d4dba5 100755 --- a/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json +++ b/data/conf/samples/registrarc/dispatchers_mysql/cgrates.json @@ -2,10 +2,12 @@ "general": { "node_id": "DispatcherS1", - "log_level": 7, "reconnects": 1 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json b/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json index d842d9daf..a6a25c72f 100644 --- a/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json +++ b/data/conf/samples/registrarc/registrarc_rpc_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":3012", "rpc_gob": ":3013", diff --git a/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json b/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json index 3d2fbb458..62a9c8007 100644 --- a/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json +++ b/data/conf/samples/registrarc/registrarc_rpc_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":3012", "rpc_gob": ":3013", diff --git a/data/conf/samples/registrarc/registrars_rpc_mongo/cgrates.json b/data/conf/samples/registrarc/registrars_rpc_mongo/cgrates.json index c9843b7a8..2f1136191 100644 --- a/data/conf/samples/registrarc/registrars_rpc_mongo/cgrates.json +++ b/data/conf/samples/registrarc/registrars_rpc_mongo/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/registrarc/registrars_rpc_mysql/cgrates.json b/data/conf/samples/registrarc/registrars_rpc_mysql/cgrates.json index 4897cfdff..08b11d3cb 100644 --- a/data/conf/samples/registrarc/registrars_rpc_mysql/cgrates.json +++ b/data/conf/samples/registrarc/registrars_rpc_mysql/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "listen": { diff --git a/data/conf/samples/resources_internal/cgrates.json b/data/conf/samples/resources_internal/cgrates.json index 7a9f341ea..857cec38e 100644 --- a/data/conf/samples/resources_internal/cgrates.json +++ b/data/conf/samples/resources_internal/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/resources_mongo/cgrates.json b/data/conf/samples/resources_mongo/cgrates.json index d7b470f01..5ec7c73ac 100644 --- a/data/conf/samples/resources_mongo/cgrates.json +++ b/data/conf/samples/resources_mongo/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/resources_mysql/cgrates.json b/data/conf/samples/resources_mysql/cgrates.json index 17104a081..5a0fe2c7a 100644 --- a/data/conf/samples/resources_mysql/cgrates.json +++ b/data/conf/samples/resources_mysql/cgrates.json @@ -1,7 +1,7 @@ { -"general": { - "log_level": 7 +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/routes_cases_internal/cgrates.json b/data/conf/samples/routes_cases_internal/cgrates.json index 3eefe3765..f89313021 100644 --- a/data/conf/samples/routes_cases_internal/cgrates.json +++ b/data/conf/samples/routes_cases_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, + "logger": { + "level": 7 + }, "data_db": { "db_type": "*internal" diff --git a/data/conf/samples/routes_cases_mongo/cgrates.json b/data/conf/samples/routes_cases_mongo/cgrates.json index 036c02b57..37977684d 100644 --- a/data/conf/samples/routes_cases_mongo/cgrates.json +++ b/data/conf/samples/routes_cases_mongo/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, + "logger": { + "level": 7 + }, "data_db": { "db_type": "mongo", diff --git a/data/conf/samples/routes_cases_mysql/cgrates.json b/data/conf/samples/routes_cases_mysql/cgrates.json index ef34f3295..4ab96a637 100644 --- a/data/conf/samples/routes_cases_mysql/cgrates.json +++ b/data/conf/samples/routes_cases_mysql/cgrates.json @@ -1,8 +1,11 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, + +"logger": { + "level": 7 +}, "data_db": { "db_type": "redis", diff --git a/data/conf/samples/routes_generaltests_internal/cgrates.json b/data/conf/samples/routes_generaltests_internal/cgrates.json index 9f447c79f..602fec4ba 100644 --- a/data/conf/samples/routes_generaltests_internal/cgrates.json +++ b/data/conf/samples/routes_generaltests_internal/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/routes_generaltests_mongo/cgrates.json b/data/conf/samples/routes_generaltests_mongo/cgrates.json index 8febe9d1d..c9961cffd 100644 --- a/data/conf/samples/routes_generaltests_mongo/cgrates.json +++ b/data/conf/samples/routes_generaltests_mongo/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/routes_generaltests_mysql/cgrates.json b/data/conf/samples/routes_generaltests_mysql/cgrates.json index 361b374ac..857964c83 100644 --- a/data/conf/samples/routes_generaltests_mysql/cgrates.json +++ b/data/conf/samples/routes_generaltests_mysql/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/routes_internal/cgrates.json b/data/conf/samples/routes_internal/cgrates.json index c184880b8..4a2bc5745 100644 --- a/data/conf/samples/routes_internal/cgrates.json +++ b/data/conf/samples/routes_internal/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/routes_mongo/cgrates.json b/data/conf/samples/routes_mongo/cgrates.json index d2977e51b..1d03559a6 100644 --- a/data/conf/samples/routes_mongo/cgrates.json +++ b/data/conf/samples/routes_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "30s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/routes_mysql/cgrates.json b/data/conf/samples/routes_mysql/cgrates.json index 52b276c7c..13426d7a9 100644 --- a/data/conf/samples/routes_mysql/cgrates.json +++ b/data/conf/samples/routes_mysql/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/rpccaching_mongo/cgrates.json b/data/conf/samples/rpccaching_mongo/cgrates.json index ce40feeb1..1bd8a3aaa 100644 --- a/data/conf/samples/rpccaching_mongo/cgrates.json +++ b/data/conf/samples/rpccaching_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "10s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/rpccaching_mysql/cgrates.json b/data/conf/samples/rpccaching_mysql/cgrates.json index cbf345249..b9829135b 100644 --- a/data/conf/samples/rpccaching_mysql/cgrates.json +++ b/data/conf/samples/rpccaching_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "10s" }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_internal/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_internal/cgrates.json index a8de92b45..2033927df 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_internal/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mongo/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mongo/cgrates.json index 37f5d0fea..455828622 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mongo/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mysql/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mysql/cgrates.json index 41d6e6eef..875add13e 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mysql/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine1_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_internal/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_internal/cgrates.json index 535ff6f88..6e53f94e7 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_internal/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":22012", "rpc_gob": ":22013", diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mongo/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mongo/cgrates.json index 31f951fbf..2b39de584 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mongo/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":22012", "rpc_gob": ":22013", diff --git a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mysql/cgrates.json b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mysql/cgrates.json index cd269cbcd..c96f03150 100644 --- a/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mysql/cgrates.json +++ b/data/conf/samples/rpcexp_multiple_engines/rpcexp_opts_engine2_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":22012", "rpc_gob": ":22013", diff --git a/data/conf/samples/sessinternal/cgrates.json b/data/conf/samples/sessinternal/cgrates.json index ce883daef..6cf365038 100644 --- a/data/conf/samples/sessinternal/cgrates.json +++ b/data/conf/samples/sessinternal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "5m", }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "*internal", diff --git a/data/conf/samples/sessintjson/cgrates.json b/data/conf/samples/sessintjson/cgrates.json index d46c0e6a3..58b35f610 100644 --- a/data/conf/samples/sessintjson/cgrates.json +++ b/data/conf/samples/sessintjson/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "5m", }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "*internal", diff --git a/data/conf/samples/session_volume_discount_internal/cgrates.json b/data/conf/samples/session_volume_discount_internal/cgrates.json index 696076026..fa76f5e46 100644 --- a/data/conf/samples/session_volume_discount_internal/cgrates.json +++ b/data/conf/samples/session_volume_discount_internal/cgrates.json @@ -4,9 +4,12 @@ // Used for sessions/sessions_volume_discount_it_test.go "general": { - "log_level": 7, "reply_timeout": "10s", }, + + "logger": { + "level": 7 + }, "data_db": { "db_type": "*internal" diff --git a/data/conf/samples/session_volume_discount_mongo/cgrates.json b/data/conf/samples/session_volume_discount_mongo/cgrates.json index f7bda3b9c..d43ada331 100644 --- a/data/conf/samples/session_volume_discount_mongo/cgrates.json +++ b/data/conf/samples/session_volume_discount_mongo/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "10s" }, + +"logger": { + "level": 7 +}, "data_db": { "db_type": "mongo", diff --git a/data/conf/samples/session_volume_discount_mysql/cgrates.json b/data/conf/samples/session_volume_discount_mysql/cgrates.json index b4d55d070..e9db76f6a 100644 --- a/data/conf/samples/session_volume_discount_mysql/cgrates.json +++ b/data/conf/samples/session_volume_discount_mysql/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "10s" }, + +"logger": { + "level": 7 +}, "data_db": { "db_type": "redis", diff --git a/data/conf/samples/sessions_internal/cgrates.json b/data/conf/samples/sessions_internal/cgrates.json index 1de89de4e..30b8115d3 100644 --- a/data/conf/samples/sessions_internal/cgrates.json +++ b/data/conf/samples/sessions_internal/cgrates.json @@ -5,10 +5,12 @@ "general": { - "log_level": 7, "reply_timeout": "10s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/sessions_mongo/cgrates.json b/data/conf/samples/sessions_mongo/cgrates.json index 3729169b6..8bd407b33 100644 --- a/data/conf/samples/sessions_mongo/cgrates.json +++ b/data/conf/samples/sessions_mongo/cgrates.json @@ -5,10 +5,12 @@ "general": { - "log_level": 7, "reply_timeout": "10s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/sessions_mysql/cgrates.json b/data/conf/samples/sessions_mysql/cgrates.json index 5e967ff83..27e294285 100644 --- a/data/conf/samples/sessions_mysql/cgrates.json +++ b/data/conf/samples/sessions_mysql/cgrates.json @@ -1,9 +1,11 @@ { "general": { - "log_level": 7, "reply_timeout": "10s" }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json index 27e67811e..02224058f 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", "rpc_gob": "127.0.0.1:22013", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json index 589b5950d..ac274acda 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", "rpc_gob": "127.0.0.1:22013", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mysql/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mysql/cgrates.json index 131c16ee7..2291dcc4a 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", "rpc_gob": "127.0.0.1:22013", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json index 1f6e17bf8..4503580aa 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json index f8248b7bb..707b9b29a 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mysql/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mysql/cgrates.json index 69bc5cdb6..d2c9319db 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mysql/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id":"MasterReplication" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json b/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json index d4a19cd68..c111c4b7f 100644 --- a/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json b/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json index da53a6e12..47a41c267 100644 --- a/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json b/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json index 54875b24e..487235ac8 100644 --- a/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", // RPC JSON listening address "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address diff --git a/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json b/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json index f03db47af..e467270b3 100644 --- a/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", // RPC JSON listening address "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address diff --git a/data/conf/samples/sipagent_internal/cgrates.json b/data/conf/samples/sipagent_internal/cgrates.json index c761040ed..5bb78c6c3 100644 --- a/data/conf/samples/sipagent_internal/cgrates.json +++ b/data/conf/samples/sipagent_internal/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. -"general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) +"logger": { + "level": 7 }, diff --git a/data/conf/samples/sipagent_mongo/cgrates.json b/data/conf/samples/sipagent_mongo/cgrates.json index 6be9195aa..b28adb92f 100644 --- a/data/conf/samples/sipagent_mongo/cgrates.json +++ b/data/conf/samples/sipagent_mongo/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. -"general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) +"logger": { + "level": 7 }, diff --git a/data/conf/samples/sipagent_mysql/cgrates.json b/data/conf/samples/sipagent_mysql/cgrates.json index 57e50bd7a..b7c5c8f8c 100644 --- a/data/conf/samples/sipagent_mysql/cgrates.json +++ b/data/conf/samples/sipagent_mysql/cgrates.json @@ -7,8 +7,8 @@ // This is what you get when you load CGRateS with an empty configuration file. -"general": { - "log_level": 7, // control the level of messages logged (0-emerg to 7-debug) +"logger": { + "level": 7 }, "stor_db": { diff --git a/data/conf/samples/smg_automatic_debits_internal/cgrates.json b/data/conf/samples/smg_automatic_debits_internal/cgrates.json index 67d8b5c85..2ac319f89 100644 --- a/data/conf/samples/smg_automatic_debits_internal/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_internal/cgrates.json @@ -3,8 +3,8 @@ // // Used in tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/smg_automatic_debits_mongo/cgrates.json b/data/conf/samples/smg_automatic_debits_mongo/cgrates.json index 3bf7dc93a..d7b8692a2 100644 --- a/data/conf/samples/smg_automatic_debits_mongo/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_mongo/cgrates.json @@ -3,8 +3,8 @@ // // Used in tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) diff --git a/data/conf/samples/smg_automatic_debits_mysql/cgrates.json b/data/conf/samples/smg_automatic_debits_mysql/cgrates.json index b29a5a8fb..b822d07ff 100644 --- a/data/conf/samples/smg_automatic_debits_mysql/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_mysql/cgrates.json @@ -3,8 +3,8 @@ // // Used in tests -"general": { - "log_level": 7, +"logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/smgreplcmaster_mongo/cgrates.json b/data/conf/samples/smgreplcmaster_mongo/cgrates.json index f50e9d119..86ba47b9f 100644 --- a/data/conf/samples/smgreplcmaster_mongo/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mongo/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json b/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json index 8d293dd83..fab3a51e5 100644 --- a/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/smgreplcmaster_mysql/cgrates.json b/data/conf/samples/smgreplcmaster_mysql/cgrates.json index 8a7fca5ed..7ed04d28b 100644 --- a/data/conf/samples/smgreplcmaster_mysql/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mysql/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json b/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json index 9da31d6d3..7c99a980e 100644 --- a/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"MasterReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:2012", "rpc_gob": "127.0.0.1:2013", diff --git a/data/conf/samples/smgreplcslave_mongo/cgrates.json b/data/conf/samples/smgreplcslave_mongo/cgrates.json index 0458bed5b..9582cdcae 100644 --- a/data/conf/samples/smgreplcslave_mongo/cgrates.json +++ b/data/conf/samples/smgreplcslave_mongo/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", // RPC JSON listening address "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address diff --git a/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json b/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json index 0ba5f0990..d73ce95ed 100644 --- a/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json +++ b/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", // RPC JSON listening address "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address diff --git a/data/conf/samples/smgreplcslave_mysql/cgrates.json b/data/conf/samples/smgreplcslave_mysql/cgrates.json index ac424c5bc..66eed44e2 100644 --- a/data/conf/samples/smgreplcslave_mysql/cgrates.json +++ b/data/conf/samples/smgreplcslave_mysql/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "stor_db": { "db_password": "CGRateS.org" }, diff --git a/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json b/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json index ae8afba0e..5d351f888 100644 --- a/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json +++ b/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json @@ -2,10 +2,13 @@ // Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"SlaveReplication", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": "127.0.0.1:22012", // RPC JSON listening address "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address diff --git a/data/conf/samples/stats_internal/cgrates.json b/data/conf/samples/stats_internal/cgrates.json index db63aece5..2f44c3c0d 100644 --- a/data/conf/samples/stats_internal/cgrates.json +++ b/data/conf/samples/stats_internal/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/stats_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/stats_mongo/cgrates.json b/data/conf/samples/stats_mongo/cgrates.json index eb884e7ed..a7945ab49 100644 --- a/data/conf/samples/stats_mongo/cgrates.json +++ b/data/conf/samples/stats_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/stats_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/stats_mysql/cgrates.json b/data/conf/samples/stats_mysql/cgrates.json index f92d735da..1b1248f81 100644 --- a/data/conf/samples/stats_mysql/cgrates.json +++ b/data/conf/samples/stats_mysql/cgrates.json @@ -1,8 +1,8 @@ { // CGRateS Configuration file // will be used in apis/stats_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) diff --git a/data/conf/samples/thresholds_internal/cgrates.json b/data/conf/samples/thresholds_internal/cgrates.json index 9d18363f6..9e3bd4388 100644 --- a/data/conf/samples/thresholds_internal/cgrates.json +++ b/data/conf/samples/thresholds_internal/cgrates.json @@ -2,10 +2,10 @@ // CGRateS Configuration file // will be used in apis/thresholds_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, - + "data_db": { "db_type": "*internal", }, diff --git a/data/conf/samples/thresholds_mongo/cgrates.json b/data/conf/samples/thresholds_mongo/cgrates.json index 422653844..5df8141cb 100644 --- a/data/conf/samples/thresholds_mongo/cgrates.json +++ b/data/conf/samples/thresholds_mongo/cgrates.json @@ -2,8 +2,8 @@ // CGRateS Configuration file // will be used in apis/thresholds_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { diff --git a/data/conf/samples/thresholds_mysql/cgrates.json b/data/conf/samples/thresholds_mysql/cgrates.json index 464ea8817..7b73c820e 100644 --- a/data/conf/samples/thresholds_mysql/cgrates.json +++ b/data/conf/samples/thresholds_mysql/cgrates.json @@ -1,8 +1,8 @@ { // CGRateS Configuration file // will be used in apis/thresholds_it_test.go - "general": { - "log_level": 7, + "logger": { + "level": 7 }, "data_db": { // database used to store runtime data (eg: accounts, cdr stats) diff --git a/data/conf/samples/tp_internal/cgrates.json b/data/conf/samples/tp_internal/cgrates.json index 8989df49e..450974204 100644 --- a/data/conf/samples/tp_internal/cgrates.json +++ b/data/conf/samples/tp_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tp_mongo/cgrates.json b/data/conf/samples/tp_mongo/cgrates.json index f29ff015d..a7f714c53 100644 --- a/data/conf/samples/tp_mongo/cgrates.json +++ b/data/conf/samples/tp_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tp_mysql/cgrates.json b/data/conf/samples/tp_mysql/cgrates.json index 9aeecd196..d010dd046 100644 --- a/data/conf/samples/tp_mysql/cgrates.json +++ b/data/conf/samples/tp_mysql/cgrates.json @@ -4,10 +4,13 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/tpe_internal/cgrates.json b/data/conf/samples/tpe_internal/cgrates.json index b66412d6d..6ca75e115 100644 --- a/data/conf/samples/tpe_internal/cgrates.json +++ b/data/conf/samples/tpe_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "*internal" diff --git a/data/conf/samples/tut_session_internal/cgrates.json b/data/conf/samples/tut_session_internal/cgrates.json index 8f46380a9..7e3634fec 100644 --- a/data/conf/samples/tut_session_internal/cgrates.json +++ b/data/conf/samples/tut_session_internal/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tut_session_mongo/cgrates.json b/data/conf/samples/tut_session_mongo/cgrates.json index a1f7644e7..9ee38c3b3 100644 --- a/data/conf/samples/tut_session_mongo/cgrates.json +++ b/data/conf/samples/tut_session_mongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tut_session_mysql/cgrates.json b/data/conf/samples/tut_session_mysql/cgrates.json index a0b00c97c..74308ef6b 100644 --- a/data/conf/samples/tut_session_mysql/cgrates.json +++ b/data/conf/samples/tut_session_mysql/cgrates.json @@ -4,10 +4,13 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/tutinternal_gob/cgrates.json b/data/conf/samples/tutinternal_gob/cgrates.json index b50bced8e..8fce8f556 100644 --- a/data/conf/samples/tutinternal_gob/cgrates.json +++ b/data/conf/samples/tutinternal_gob/cgrates.json @@ -4,10 +4,13 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/tutinternal_new/cgrates.json b/data/conf/samples/tutinternal_new/cgrates.json index 9647dd569..f94e292b6 100644 --- a/data/conf/samples/tutinternal_new/cgrates.json +++ b/data/conf/samples/tutinternal_new/cgrates.json @@ -1,10 +1,12 @@ { "general": { - "log_level": 7, "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index 973005abe..fb346a94e 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -3,10 +3,12 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tutmongo2/cgrates.json b/data/conf/samples/tutmongo2/cgrates.json index f104e7644..81e01e1d8 100644 --- a/data/conf/samples/tutmongo2/cgrates.json +++ b/data/conf/samples/tutmongo2/cgrates.json @@ -5,9 +5,11 @@ "general": { "node_id": "CGRateSTutorial", - "log_level": 7 }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tutmongo2_gob/cgrates.json b/data/conf/samples/tutmongo2_gob/cgrates.json index 74f925c0a..f746f3452 100644 --- a/data/conf/samples/tutmongo2_gob/cgrates.json +++ b/data/conf/samples/tutmongo2_gob/cgrates.json @@ -5,7 +5,10 @@ "general": { "node_id": "CGRateSTutorial", - "log_level": 7 +}, + +"logger": { + "level": 7 }, "rpc_conns": { diff --git a/data/conf/samples/tutmongo_gob/cgrates.json b/data/conf/samples/tutmongo_gob/cgrates.json index a2c074461..87557e5ad 100644 --- a/data/conf/samples/tutmongo_gob/cgrates.json +++ b/data/conf/samples/tutmongo_gob/cgrates.json @@ -3,10 +3,13 @@ "general": { - "log_level": 7, "reply_timeout": "30s", }, +"logger": { + "level": 7 +}, + "rpc_conns": { "conn1": { "strategy": "*first", diff --git a/data/conf/samples/tutmongojson/cgrates.json b/data/conf/samples/tutmongojson/cgrates.json index 10c4cb246..0aa5581f8 100644 --- a/data/conf/samples/tutmongojson/cgrates.json +++ b/data/conf/samples/tutmongojson/cgrates.json @@ -3,11 +3,13 @@ "general": { - "log_level": 7, "dbdata_encoding": "json", "reply_timeout": "30s", }, + "logger": { + "level": 7 + }, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tutmysql/cgrates.json b/data/conf/samples/tutmysql/cgrates.json index e6d3b718e..825e8e73e 100644 --- a/data/conf/samples/tutmysql/cgrates.json +++ b/data/conf/samples/tutmysql/cgrates.json @@ -4,10 +4,12 @@ "general": { - "log_level": 7, "reply_timeout": "50s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/conf/samples/tutmysqljson/cgrates.json b/data/conf/samples/tutmysqljson/cgrates.json index 7819b5751..517549e1b 100644 --- a/data/conf/samples/tutmysqljson/cgrates.json +++ b/data/conf/samples/tutmysqljson/cgrates.json @@ -1,11 +1,14 @@ { "general": { - "log_level": 7, "dbdata_encoding": "json", "reply_timeout": "50s" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/twoengines/engine1/cgrates.json b/data/conf/samples/twoengines/engine1/cgrates.json index 5acdecd3f..af9daf4be 100644 --- a/data/conf/samples/twoengines/engine1/cgrates.json +++ b/data/conf/samples/twoengines/engine1/cgrates.json @@ -1,10 +1,13 @@ { "general": { - "log_level": 7, "node_id": "Engine1" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":2012", "rpc_gob": ":2013", diff --git a/data/conf/samples/twoengines/engine2/cgrates.json b/data/conf/samples/twoengines/engine2/cgrates.json index 138c3324e..7d54de9ec 100644 --- a/data/conf/samples/twoengines/engine2/cgrates.json +++ b/data/conf/samples/twoengines/engine2/cgrates.json @@ -1,9 +1,12 @@ { "general": { - "log_level": 7, "node_id": "Engine2" }, +"logger": { + "level": 7 +}, + "listen": { "rpc_json": ":20212", "rpc_gob": ":20213", diff --git a/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json index 55ae6dc74..53d6edc50 100644 --- a/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json @@ -4,11 +4,13 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRAsterisk", "reply_timeout": "5s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json index 7e93c2600..b544a083c 100644 --- a/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json @@ -4,10 +4,12 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRFreeswitch", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json index 1dcdb7f80..23fad4483 100644 --- a/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json @@ -4,11 +4,13 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRKamailio", "reply_timeout": "5s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json index db60c96f9..daa9917c2 100644 --- a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json @@ -4,11 +4,13 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRAsterisk", "reply_timeout": "5s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json index 23eb87485..dccf599e1 100644 --- a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json @@ -4,10 +4,12 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRFreeswitch", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json index 8e265ed61..c733f9f5e 100644 --- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json @@ -4,11 +4,13 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRKamailio", "reply_timeout": "5s", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/data/tutorials/sip_redirect/cgrates/etc/cgrates/cgrates.json b/data/tutorials/sip_redirect/cgrates/etc/cgrates/cgrates.json index f8233a445..9b706af83 100644 --- a/data/tutorials/sip_redirect/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/sip_redirect/cgrates/etc/cgrates/cgrates.json @@ -4,10 +4,12 @@ // Copyright (C) ITsysCOM GmbH "general": { - "log_level": 7, "node_id":"CGRSIP", }, +"logger": { + "level": 7 +}, "listen": { "rpc_json": ":2012", diff --git a/general_tests/shared_client_lock_it_test.go b/general_tests/shared_client_lock_it_test.go index def80d1e2..8b4a14746 100644 --- a/general_tests/shared_client_lock_it_test.go +++ b/general_tests/shared_client_lock_it_test.go @@ -76,10 +76,12 @@ func TestSharedClientLockIT(t *testing.T) { func testSharedClientLockLoadConfig(t *testing.T) { content := `{ "general": { - "log_level": 7, "node_id": "shared_client_lock", "reply_timeout": "10m", }, +"logger": { + "level": 7 +}, "data_db": { "db_type": "*internal" },