kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #992 in FS/freeswitch from ~DINGDING/freeswitch:FS-9611-mod_odbc_cdr-Sql-insert-failed-do-not-write-csv-file to master 

* commit 'b17b0a5db0f9186feb33b0d2f9a191e3c2d86869':
  FS-9611 [mod_odbc_cdr] fix sql insert failed do not write csv file and csv Duplicate file name will be overwritten
This commit is contained in:
Mike Jerris 2016-10-05 14:26:01 -05:00
parent e5ba6daf8d b17b0a5db0
commit 5cd52b5c0f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/event_handlers/mod_odbc_cdr/mod_odbc_cdr.c
View File

@ -308,22 +308,22 @@ static switch_status_t odbc_cdr_reporting(switch_core_session_t *session)
if (globals.debug_sql == SWITCH_TRUE) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sql %s\n", sql);
}
if (odbc_cdr_execute_sql_no_callback(sql) == SWITCH_STATUS_FALSE) {
if (odbc_cdr_execute_sql_no_callback(sql) != SWITCH_STATUS_SUCCESS) {
insert_fail = SWITCH_TRUE;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error executing query %s\n", sql);
}
if (globals.write_csv == ODBC_CDR_CSV_ALWAYS) {
if (insert_fail == SWITCH_TRUE) {
full_path = switch_mprintf("%s%s%s.csv", globals.csv_fail_path, SWITCH_PATH_SEPARATOR, uuid);
full_path = switch_mprintf("%s%s%s_%s.csv", globals.csv_fail_path, SWITCH_PATH_SEPARATOR, uuid, table_name);
} else {
full_path = switch_mprintf("%s%s%s.csv", globals.csv_path, SWITCH_PATH_SEPARATOR, uuid);
full_path = switch_mprintf("%s%s%s_%s.csv", globals.csv_path, SWITCH_PATH_SEPARATOR, uuid, table_name);
}
assert(full_path);
write_cdr(full_path, stream_value.data);
switch_safe_free(full_path);
} else if (globals.write_csv == ODBC_CDR_CSV_ON_FAIL && insert_fail == SWITCH_TRUE) {
full_path = switch_mprintf("%s%s%s.csv", globals.csv_fail_path, SWITCH_PATH_SEPARATOR, uuid);
full_path = switch_mprintf("%s%s%s_%s.csv", globals.csv_fail_path, SWITCH_PATH_SEPARATOR, uuid, table_name);
assert(full_path);
write_cdr(full_path, stream_value.data);
switch_safe_free(full_path);