Merge 2a419ecda0 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_erlang_event/ei_helpers.c

@@ -65,8 +65,6 @@ void ei_link(listener_t *listener, erlang_pid * from, erlang_pid * to)
 	char *s;
 	int index = 0;
 	int status = SWITCH_STATUS_SUCCESS;
-	switch_socket_t *sock = NULL;
-	switch_os_sock_put(&sock, &listener->sockdes, listener->pool);
 
 	index = 5;					/* max sizes: */
 	ei_encode_version(msgbuf, &index);	/*   1 */
@@ -81,12 +79,9 @@ void ei_link(listener_t *listener, erlang_pid * from, erlang_pid * to)
 	put8(s, ERL_PASS_THROUGH);	/*   1 */
 	/* sum:  542 */
 
-	switch_mutex_lock(listener->sock_mutex);
+	if (write(listener->sockdes, msgbuf, index) == -1) {
-	status = switch_socket_send(sock, msgbuf, (switch_size_t *) &index);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to link to process on %s, status:%d\n", listener->peer_nodename, status);
-	if (status != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to link to process on %s\n", listener->peer_nodename);
 	}
-	switch_mutex_unlock(listener->sock_mutex);
 }
 
 void ei_encode_switch_event_headers(ei_x_buff * ebuf, switch_event_t *event)

src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c

@@ -973,7 +973,7 @@ static void listener_main_loop(listener_t *listener)
 	int status = 1;
 	int msgs_sent = 0; /* how many messages we sent in a loop */
 
-	while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) {
+	while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN || erl_errno == 0) && !prefs.done) {
 		erlang_msg msg;
 		ei_x_buff buf;
 		ei_x_buff rbuf;
@@ -1937,6 +1937,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_erlang_event_load)
 	switch_application_interface_t *app_interface;
 	switch_api_interface_t *api_interface;
 
+#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11
+	ei_init();
+#endif
+
 	module_pool = pool;
 
 	memset(&prefs, 0, sizeof(prefs));