Merge 6e7e76be88 into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
+void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
+{
+	char *err_str;
+
+	if (err && !(*err)) {
+		err_str = pgsql_handle_get_error(handle);
+
+		if (zstr(err_str)) {
+			switch_safe_free(err_str);
+			err_str = strdup((char *)"SQL ERROR!");
+		}
+
+		*err = err_str;
+	}
+}
+
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 

src/mod/event_handlers/mod_odbc_cdr/conf/autoload_configs/odbc_cdr.conf.xml

@@ -10,6 +10,10 @@
     <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" -->
     <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 -->
 	<param name="debug-sql" value="true"/>
   </settings>

src/mod/event_handlers/mod_odbc_cdr/mod_odbc_cdr.c

@@ -52,13 +52,20 @@ typedef enum {
 	ODBC_CDR_CSV_ON_FAIL
 } odbc_cdr_write_csv_t;
 
+typedef enum {
+	ODBC_CDR_SQL_NEVER,
+	ODBC_CDR_SQL_ON_FAIL
+} odbc_cdr_write_sql_t;
+
 static struct {
 	char *odbc_dsn;
 	char *dbname;
 	char *csv_path;
 	char *csv_fail_path;
+	char *sql_fail_path;
 	odbc_cdr_log_leg_t log_leg;
 	odbc_cdr_write_csv_t write_csv;
+	odbc_cdr_write_sql_t write_sql;
 	switch_bool_t debug_sql;
 	switch_hash_t *table_hash;
 	uint32_t running;
@@ -364,6 +371,13 @@ static switch_status_t odbc_cdr_reporting(switch_core_session_t *session)
 					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(stream_field.data);
@@ -414,6 +428,7 @@ static switch_status_t odbc_cdr_load_config(void)
 	globals.debug_sql = SWITCH_FALSE;
 	globals.log_leg = ODBC_CDR_LOG_BOTH;
 	globals.write_csv = ODBC_CDR_CSV_NEVER;
+	globals.write_sql = ODBC_CDR_SQL_NEVER;
 
 	if ((settings = switch_xml_child(cfg, "settings")) != NULL) {
 		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")) {
 					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)) {
 				globals.csv_path = switch_mprintf("%s%s", val, SWITCH_PATH_SEPARATOR);
 			} else if (!strcasecmp(var, "csv-path-on-fail") && !zstr(val)) {
 				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);
 			}
 		}
 	}