Merge 7b1ee74e0e 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/applications/mod_av/mod_av.c

@@ -112,13 +112,13 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl)
 	switch_log_level_t switch_level = SWITCH_LOG_DEBUG;
  
 	/* naggy messages */
-	if ((level == AV_LOG_DEBUG || level == AV_LOG_WARNING || level == AV_LOG_TRACE) && !mod_av_globals.debug) return;
+	if ((level == AV_LOG_DEBUG  || level == AV_LOG_TRACE) && !mod_av_globals.debug) return;
 
 	switch(level) {
 		case AV_LOG_QUIET:   switch_level = SWITCH_LOG_CONSOLE; break;
-		case AV_LOG_PANIC:   switch_level = SWITCH_LOG_DEBUG2;   break;
-		case AV_LOG_FATAL:   switch_level = SWITCH_LOG_DEBUG2;   break;
-		case AV_LOG_ERROR:   switch_level = SWITCH_LOG_DEBUG2;   break;
+		case AV_LOG_PANIC:   switch_level = SWITCH_LOG_ERROR;   break;
+		case AV_LOG_FATAL:   switch_level = SWITCH_LOG_ERROR;   break;
+		case AV_LOG_ERROR:   switch_level = SWITCH_LOG_ERROR;   break;
 		case AV_LOG_WARNING: switch_level = SWITCH_LOG_WARNING; break;
 		case AV_LOG_INFO:    switch_level = SWITCH_LOG_INFO;    break;
 		case AV_LOG_VERBOSE: switch_level = SWITCH_LOG_INFO;    break;
@@ -222,7 +222,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_av_load)
 #endif
 
 	av_log_set_callback(log_callback);
-	av_log_set_level(AV_LOG_INFO);
+	av_log_set_level(AV_LOG_DEBUG);
 	avformat_network_init();
 
 #if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100))

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;
 }