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

[mod_odbc_cdr] add sql output to file on failed db insert

This commit is contained in:
Martin.Paterson 2024-02-28 16:41:10 +00:00
parent 739e770c34
commit 6e7e76be88
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/event_handlers/mod_odbc_cdr/conf/autoload_configs/odbc_cdr.conf.xml
View File

@ -10,6 +10,10 @@
<param name="csv-path" value="/usr/local/freeswitch/log/odbc_cdr"/> <param name="csv-path" value="/usr/local/freeswitch/log/odbc_cdr"/>
<!-- if "csv-path-on-fail" is set, failed INSERTs will be placed here as CSV files otherwise they will be placed in "csv-path" --> <!-- if "csv-path-on-fail" is set, failed INSERTs will be placed here as CSV files otherwise they will be placed in "csv-path" -->
<param name="csv-path-on-fail" value="/usr/local/freeswitch/log/odbc_cdr/failed"/> <param name="csv-path-on-fail" value="/usr/local/freeswitch/log/odbc_cdr/failed"/>
<!-- value can be "never", "on-db-fail" -->
<param name="write-sql" value="on-db-fail"/>
<!-- failed INSERTs will be placed here -->
<param name="sql-path-on-fail" value="/usr/local/freeswitch/log/odbc_cdr/failed"/>
<!-- dump SQL statement after leg ends --> <!-- dump SQL statement after leg ends -->
<param name="debug-sql" value="true"/> <param name="debug-sql" value="true"/>
</settings> </settings>

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

@ -52,13 +52,20 @@ typedef enum {
ODBC_CDR_CSV_ON_FAIL ODBC_CDR_CSV_ON_FAIL
} odbc_cdr_write_csv_t; } odbc_cdr_write_csv_t;
typedef enum {
ODBC_CDR_SQL_NEVER,
ODBC_CDR_SQL_ON_FAIL
} odbc_cdr_write_sql_t;
static struct { static struct {
char *odbc_dsn; char *odbc_dsn;
char *dbname; char *dbname;
char *csv_path; char *csv_path;
char *csv_fail_path; char *csv_fail_path;
char *sql_fail_path;
odbc_cdr_log_leg_t log_leg; odbc_cdr_log_leg_t log_leg;
odbc_cdr_write_csv_t write_csv; odbc_cdr_write_csv_t write_csv;
odbc_cdr_write_sql_t write_sql;
switch_bool_t debug_sql; switch_bool_t debug_sql;
switch_hash_t *table_hash; switch_hash_t *table_hash;
uint32_t running; uint32_t running;
@ -364,6 +371,13 @@ static switch_status_t odbc_cdr_reporting(switch_core_session_t *session)
switch_safe_free(full_path); switch_safe_free(full_path);
} }
if (globals.write_sql == ODBC_CDR_SQL_ON_FAIL && insert_fail == SWITCH_TRUE) {
full_path = switch_mprintf("%s%s%s_%s.sql", globals.sql_fail_path, SWITCH_PATH_SEPARATOR, uuid, table_name);
assert(full_path);
write_cdr(full_path, sql);
switch_safe_free(full_path);
}
switch_safe_free(sql); switch_safe_free(sql);
switch_safe_free(stream_field.data); switch_safe_free(stream_field.data);
@ -414,6 +428,7 @@ static switch_status_t odbc_cdr_load_config(void)
globals.debug_sql = SWITCH_FALSE; globals.debug_sql = SWITCH_FALSE;
globals.log_leg = ODBC_CDR_LOG_BOTH; globals.log_leg = ODBC_CDR_LOG_BOTH;
globals.write_csv = ODBC_CDR_CSV_NEVER; globals.write_csv = ODBC_CDR_CSV_NEVER;
globals.write_sql = ODBC_CDR_SQL_NEVER;
if ((settings = switch_xml_child(cfg, "settings")) != NULL) { if ((settings = switch_xml_child(cfg, "settings")) != NULL) {
for (param = switch_xml_child(settings, "param"); param; param = param->next) { for (param = switch_xml_child(settings, "param"); param; param = param->next) {
@ -444,10 +459,16 @@ static switch_status_t odbc_cdr_load_config(void)
} else if (!strcasecmp(val, "on-db-fail")) { } else if (!strcasecmp(val, "on-db-fail")) {
globals.write_csv = ODBC_CDR_CSV_ON_FAIL; globals.write_csv = ODBC_CDR_CSV_ON_FAIL;
} }
} else if (!strcasecmp(var, "write-sql") && !zstr(val)) {
if (!strcasecmp(val, "on-db-fail")) {
globals.write_sql = ODBC_CDR_SQL_ON_FAIL;
}
} else if (!strcasecmp(var, "csv-path") && !zstr(val)) { } else if (!strcasecmp(var, "csv-path") && !zstr(val)) {
globals.csv_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR); globals.csv_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR);
} else if (!strcasecmp(var, "csv-path-on-fail") && !zstr(val)) { } else if (!strcasecmp(var, "csv-path-on-fail") && !zstr(val)) {
globals.csv_fail_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR); globals.csv_fail_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR);
} else if (!strcasecmp(var, "sql-path-on-fail") && !zstr(val)) {
globals.sql_fail_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR);
} }
} }
} }