SM-FreeSWITCH: fix postpaid calls not being allowed out, Various local test fixes and preparations for release

This commit is contained in:
DanB
2015-07-31 16:29:46 +02:00
parent 9176f56589
commit 9bd7ef2c37
17 changed files with 183 additions and 222 deletions

View File

@@ -10,6 +10,9 @@
"rater": {
"enabled": true, // enable Rater service: <true|false>
"cdrstats": "internal", // address where to reach the cdrstats service, empty to disable stats functionality<""|internal|x.y.z.y:1234>
"historys": "internal", // address where to reach the history service, empty to disable history functionality: <""|internal|x.y.z.y:1234>
"pubsubs": "internal", // address where to reach the pubusb service, empty to disable pubsub functionality: <""|internal|x.y.z.y:1234>
"users": "internal", // address where to reach the user service, empty to disable user profile functionality: <""|internal|x.y.z.y:1234>
},
@@ -42,7 +45,7 @@
"cost_shift_digits": 0, // shift digits in the cost on export (eg: convert from EUR to cents)
"mask_destination_id": "MASKED_DESTINATIONS", // destination id containing called addresses to be masked on export
"mask_length": 0, // length of the destination suffix to be masked
"export_dir": "/tmp/cgr_fsevsock/cgrates/cdre", // path where the exported CDRs will be placed
"export_dir": "/tmp/cgr_osipsasync/cgrates/cdre", // path where the exported CDRs will be placed
"header_fields": [], // template of the exported header fields
"content_fields": [ // template of the exported content fields
{"tag": "CgrId", "cdr_field_id": "cgrid", "type": "cdrfield", "value": "cgrid"},
@@ -62,7 +65,34 @@
{"tag":"Cost", "cdr_field_id": "cost", "type": "cdrfield", "value": "cost"},
],
"trailer_fields": [], // template of the exported trailer fields
}
},
"customer_tpl": {
"cdr_format": "csv", // exported CDRs format <csv>
"field_separator": ";",
"data_usage_multiply_factor": 1, // multiply data usage before export (eg: convert from KBytes to Bytes)
"sms_usage_multiply_factor": 1, // multiply data usage before export (eg: convert from SMS unit to call duration in some billing systems)
"generic_usage_multiply_factor": 1, // multiply data usage before export (eg: convert from GENERIC unit to call duration in some billing systems)
"cost_multiply_factor": 1, // multiply cost before export, eg: add VAT
"cost_rounding_decimals": -1, // rounding decimals for Cost values. -1 to disable rounding
"cost_shift_digits": 0, // shift digits in the cost on export (eg: convert from EUR to cents)
"mask_destination_id": "MASKED_DESTINATIONS", // destination id containing called addresses to be masked on export
"mask_length": 0, // length of the destination suffix to be masked
"export_dir": "/tmp/cgr_osipsasync/cgrates/cdre", // path where the exported CDRs will be placed
"header_fields": [], // template of the exported header fields
"content_fields": [ // template of the exported content fields
{"tag": "CgrId", "cdr_field_id": "cgrid", "type": "cdrfield", "value": "cgrid"},
{"tag":"AccId", "cdr_field_id": "accid", "type": "cdrfield", "value": "accid"},
{"tag":"ReqType", "cdr_field_id": "reqtype", "type": "cdrfield", "value": "reqtype"},
{"tag":"Tenant", "cdr_field_id": "tenant", "type": "cdrfield", "value": "tenant"},
{"tag":"Category", "cdr_field_id": "category", "type": "cdrfield", "value": "category"},
{"tag":"Subject", "cdr_field_id": "account", "type": "cdrfield", "value": "account"},
{"tag":"Destination", "cdr_field_id": "destination", "type": "cdrfield", "value": "~destination:s/^1(\\d+)/+$1/:s/^\\+(\\d+)/00$1/"},
{"tag":"AnswerTime", "cdr_field_id": "answer_time", "type": "cdrfield", "value": "answer_time", "layout": "2006-01-02T15:04:05Z07:00"},
{"tag":"Usage", "cdr_field_id": "usage", "type": "cdrfield", "value": "usage"},
{"tag":"Cost", "cdr_field_id": "cost", "type": "cdrfield", "value": "cost"},
],
"trailer_fields": [],
},
},
@@ -78,15 +108,20 @@
},
"history_server": {
"enabled": true, // starts History service: <true|false>.
"historys": {
"enabled": true, // starts History service: <true|false>.
"history_dir": "/tmp/cgr_osipsasync/cgrates/history", // location on disk where to store history files.
},
"history_agent": {
"enabled": true, // starts History as a client: <true|false>.
"server": "internal", // address where to reach the master history server: <internal|x.y.z.y:1234>
"pubsubs": {
"enabled": true, // starts PubSub service: <true|false>.
},
"users": {
"enabled": true, // starts User service: <true|false>.
"indexes": ["Uuid"], // user profile field indexes
},

View File

@@ -91,22 +91,22 @@ modparam("db_flatstore", "single_file", 1)
loadmodule "acc.so"
modparam("acc", "detect_direction", 1)
#modparam("acc", "cdr_flag", "CDR")
#modparam("acc", "evi_flag", "CDR")
#modparam("acc", "evi_missed_flag", "CDR")
modparam("acc", "evi_flag", "CDR")
modparam("acc", "evi_missed_flag", "CDR")
modparam("acc", "evi_extra", "cgr_reqtype=$avp(cgr_reqtype);
cgr_account=$avp(cgr_account);
cgr_destination=$avp(cgr_destination);
cgr_supplier=$avp(cgr_supplier);
dialog_id=$DLG_did")
modparam("acc", "db_url", "flatstore:/tmp")
modparam("acc", "db_flag", "CDR")
modparam("acc", "db_missed_flag", "CDR")
modparam("acc", "db_table_missed_calls", "cgr_missed")
modparam("acc", "db_extra", "cgr_reqtype=$avp(cgr_reqtype);
cgr_account=$avp(cgr_account);
cgr_destination=$avp(cgr_destination);
cgr_supplier=$avp(cgr_supplier);
dialog_id=$DLG_did")
#modparam("acc", "db_url", "flatstore:/tmp")
#modparam("acc", "db_flag", "CDR")
#modparam("acc", "db_missed_flag", "CDR")
#modparam("acc", "db_table_missed_calls", "cgr_missed")
#modparam("acc", "db_extra", "cgr_reqtype=$avp(cgr_reqtype);
# cgr_account=$avp(cgr_account);
# cgr_destination=$avp(cgr_destination);
# cgr_supplier=$avp(cgr_supplier);
# dialog_id=$DLG_did")
#### CfgUtils module
loadmodule "cfgutils.so"
@@ -358,9 +358,6 @@ route[location] {
t_reply("404", "Not Found");
exit;
}
append_branch();
append_branch();
setflag(CDR);
}
failure_route[missed_call] {