From b3cbf4eca2afd30fb079345e6fb6ccf32038b12b Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 23 Jul 2015 13:10:45 +0200 Subject: [PATCH] Syncing data/conf/cgrates.json with internal defaults --- config/config_defaults.go | 13 ++++--- data/conf/cgrates/cgrates.json | 64 ++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/config/config_defaults.go b/config/config_defaults.go index 01b8a4c61..d7e4166d4 100644 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -36,8 +36,8 @@ const CGRATES_CFG_JSON = ` "default_category": "call", // default Type of Record to consider when missing from requests "default_tenant": "cgrates.org", // default Tenant to consider when missing from requests "default_subject": "cgrates", // default rating Subject to consider when missing from requests - "connect_attempts": 3, // initial server connect attempts - "reconnects": -1, // number of retries in case of connection lost + "connect_attempts": 3, // initial server connect attempts + "reconnects": -1, // number of retries in case of connection lost }, @@ -89,9 +89,9 @@ const CGRATES_CFG_JSON = ` "enabled": false, // enable Rater service: "balancer": "", // register to balancer as worker: <""|internal|x.y.z.y:1234> "cdrstats": "", // address where to reach the cdrstats service, empty to disable stats functionality: <""|internal|x.y.z.y:1234> - "historys": "", // address where to reach the history service, empty to disable history functionality: <""|internal|x.y.z.y:1234> - "pubsubs": "", // address where to reach the pubusb service, empty to disable pubsub functionality: <""|internal|x.y.z.y:1234> - "users": "", // address where to reach the user service, empty to disable user profile functionality: <""|internal|x.y.z.y:1234> + "historys": "", // address where to reach the history service, empty to disable history functionality: <""|internal|x.y.z.y:1234> + "pubsubs": "", // address where to reach the pubusb service, empty to disable pubsub functionality: <""|internal|x.y.z.y:1234> + "users": "", // address where to reach the user service, empty to disable user profile functionality: <""|internal|x.y.z.y:1234> }, @@ -113,7 +113,7 @@ const CGRATES_CFG_JSON = ` "cdrstats": { "enabled": false, // starts the cdrstats service: - "save_interval": "1m", // interval to save changed stats into dataDb storage + "save_interval": "1m", // interval to save changed stats into dataDb storage }, @@ -235,7 +235,6 @@ const CGRATES_CFG_JSON = ` "max_call_duration": "3h", // maximum call duration a prepaid call can last "events_subscribe_interval": "60s", // automatic events subscription to OpenSIPS, 0 to disable it "mi_addr": "127.0.0.1:8020", // address where to reach OpenSIPS MI to send session disconnects - }, diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index 3950980cd..7921f6647 100644 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -8,7 +8,7 @@ //"general": { -// "http_skip_tls_veify": false, // if enabled Http Client will accept any TLS certificate +// "http_skip_tls_verify": false, // if enabled Http Client will accept any TLS certificate // "rounding_decimals": 10, // system level precision for floats // "dbdata_encoding": "msgpack", // encoding used to store object data in strings: // "tpexport_dir": "/var/log/cgrates/tpe", // path towards export folder for offline Tariff Plans @@ -16,6 +16,8 @@ // "default_category": "call", // default Type of Record to consider when missing from requests // "default_tenant": "cgrates.org", // default Tenant to consider when missing from requests // "default_subject": "cgrates", // default rating Subject to consider when missing from requests +// "connect_attempts": 3, // initial server connect attempts +// "reconnects": -1, // number of retries in case of connection lost //}, @@ -26,27 +28,27 @@ //}, -//"rating_db": { -// "db_type": "redis", // rating subsystem database type: -// "db_host": "127.0.0.1", // rating subsystem database host address -// "db_port": 6379, // rating subsystem port to reach the database -// "db_name": "10", // rating subsystem database name to connect to -// "db_user": "", // rating subsystem username to use when connecting to database -// "db_passwd": "", // rating subsystem password to use when connecting to database +//"tariffplan_db": { // database used to store active tariff plan configuration +// "db_type": "redis", // tariffplan_db type: +// "db_host": "127.0.0.1", // tariffplan_db host address +// "db_port": 6379, // port to reach the tariffplan_db +// "db_name": "10", // tariffplan_db name to connect to +// "db_user": "", // sername to use when connecting to tariffplan_db +// "db_passwd": "", // password to use when connecting to tariffplan_db //}, -//"accounting_db": { -// "db_type": "redis", // accounting subsystem database: -// "db_host": "127.0.0.1", // accounting subsystem database host address -// "db_port": 6379, // accounting subsystem port to reach the database -// "db_name": "11", // accounting subsystem database name to connect to -// "db_user": "", // accounting subsystem username to use when connecting to database -// "db_passwd": "", // accounting subsystem password to use when connecting to database +//"data_db": { // database used to store runtime data (eg: accounts, cdr stats) +// "db_type": "redis", // data_db type: +// "db_host": "127.0.0.1", // data_db host address +// "db_port": 6379, // data_db port to reach the database +// "db_name": "11", // data_db database name to connect to +// "db_user": "", // username to use when connecting to data_db +// "db_passwd": "", // password to use when connecting to data_db //}, -//"stor_db": { +//"stor_db": { // database used to store offline tariff plans and CDRs // "db_type": "mysql", // stor database type to use: // "db_host": "127.0.0.1", // the host to connect to // "db_port": 3306, // the port to reach the stordb @@ -66,10 +68,10 @@ //"rater": { // "enabled": false, // enable Rater service: // "balancer": "", // register to balancer as worker: <""|internal|x.y.z.y:1234> -// "cdrstats": "", // address where to reach the cdrstats service, empty to disable stats functionality<""|internal|x.y.z.y:1234> -// "historys": "", // address where to reach the history service, empty to disable history functionality<""|internal|x.y.z.y:1234> -// "pubsubs": "", // address where to reach the pubsub service, empty to disable pubsub functionality<""|internal|x.y.z.y:1234> -// "users": "", // address where to reach the user service, empty to disable user profile functionality<""|internal|x.y.z.y:1234> +// "cdrstats": "", // address where to reach the cdrstats service, empty to disable stats functionality: <""|internal|x.y.z.y:1234> +// "historys": "", // address where to reach the history service, empty to disable history functionality: <""|internal|x.y.z.y:1234> +// "pubsubs": "", // address where to reach the pubusb service, empty to disable pubsub functionality: <""|internal|x.y.z.y:1234> +// "users": "", // address where to reach the user service, empty to disable user profile functionality: <""|internal|x.y.z.y:1234> //}, @@ -90,8 +92,8 @@ //"cdrstats": { - // "enabled": false, // starts the cdrstats service: - // "save_interval": "5s", +// "enabled": false, // starts the cdrstats service: +// "save_interval": "1m", // interval to save changed stats into dataDb storage //}, @@ -135,14 +137,17 @@ // "*default": { // "enabled": false, // enable CDR client functionality // "cdrs": "internal", // address where to reach CDR server. -// "cdr_format": "csv", // CDR file format +// "cdr_format": "csv", // CDR file format // "field_separator": ",", // separator used in case of csv files // "run_delay": 0, // sleep interval in seconds between consecutive runs, 0 to use automation via inotify +// "max_open_files": 1024, // maximum simultaneous files to process, 0 for unlimited // "data_usage_multiply_factor": 1024, // conversion factor for data usage // "cdr_in_dir": "/var/log/cgrates/cdrc/in", // absolute path towards the directory where the CDRs are stored // "cdr_out_dir": "/var/log/cgrates/cdrc/out", // absolute path towards the directory where processed CDRs will be moved +// "failed_calls_prefix": "missed_calls", // used in case of flatstore CDRs to avoid searching for BYE records // "cdr_source_id": "freeswitch_csv", // free form field, tag identifying the source of the CDRs within CDRS database -// "cdr_filter": "", // Filter CDR records to import +// "cdr_filter": "", // filter CDR records to import +// "partial_record_cache": "10s", // duration to cache partial records when not pairing // "cdr_fields":[ // import template, tag will match internally CDR field, in case of .csv value will be represented by index of the field value // {"tag": "tor", "cdr_field_id": "tor", "type": "cdrfield", "value": "2", "mandatory": true}, // {"tag": "accid", "cdr_field_id": "accid", "type": "cdrfield", "value": "3", "mandatory": true}, @@ -175,7 +180,7 @@ // "low_balance_ann_file": "", // file to be played when low balance is reached for prepaid calls // "empty_balance_context": "", // if defined, prepaid calls will be transfered to this context on empty balance // "empty_balance_ann_file": "", // file to be played before disconnecting prepaid calls on empty balance (applies only if no context defined) -// "subscribe_park": true, // subscribe via fsock to receive park events +// "subscribe_park": true, // subscribe via fsock to receive park events // "channel_sync_interval": "5m", // sync channels with freeswitch regularly // "connections":[ // instantiate connections to multiple FreeSWITCH servers // {"server": "127.0.0.1:8021", "password": "ClueCon", "reconnects": 5} @@ -220,15 +225,14 @@ //}, - //"pubsubs": { -// "enabled": false, // starts pubsub service: . +// "enabled": false, // starts PubSub service: . //}, //"users": { -// "enabled": false, // starts pubsub service: . -// "indexes": [], // name of the user profile fields to be indexed +// "enabled": false, // starts User service: . +// "indexes": [], // user profile field indexes //}, @@ -240,4 +244,4 @@ //}, -} +//}