[Minor] Improve lua_tcp logging

diff --git a/src/libserver/events.c b/src/libserver/events.c
index ac9b0ccf2a9e48e75a16503f8f4ca0e9aa3042ba..d609bcbb7c88a0cdf138fa2ae20f08d67e7637d6 100644 (file)
--- a/src/libserver/events.c
+++ b/src/libserver/events.c
@@ -455,3 +455,12 @@ rspamd_session_get_watcher (struct rspamd_async_session *session)
                return NULL;
        }
 }
+
+
+rspamd_mempool_t *
+rspamd_session_mempool (struct rspamd_async_session *session)
+{
+       g_assert (session != NULL);
+
+       return session->pool;
+}
\ No newline at end of file

diff --git a/src/libserver/events.h b/src/libserver/events.h
index a0f99c0a56ea7b839c225cabc1bae21604e85217..760bb000c8e1180e4ebb9f7e9ad94db5fe278ce0 100644 (file)
--- a/src/libserver/events.h
+++ b/src/libserver/events.h
@@ -72,6 +72,13 @@ gboolean rspamd_session_destroy (struct rspamd_async_session *session);
  */
 void rspamd_session_cleanup (struct rspamd_async_session *session);
 
+/**
+ * Returns mempool associated with async session
+ * @param session
+ * @return
+ */
+rspamd_mempool_t * rspamd_session_mempool (struct rspamd_async_session *session);
+
 /**
  * Check session for events pending and call fin callback if no events are pending
  * @param session session object

diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c
index f263d53939f12f45ff8243a36fd38a79faa74d3f..884bbc2aecbefea03a902f2a415a22653854c700 100644 (file)
--- a/src/lua/lua_tcp.c
+++ b/src/lua/lua_tcp.c
@@ -826,7 +826,18 @@ lua_tcp_make_connection (struct lua_tcp_cbdata *cbd)
        fd = rspamd_inet_address_connect (cbd->addr, SOCK_STREAM, TRUE);
 
        if (fd == -1) {
-               msg_info ("cannot connect to %s", rspamd_inet_address_to_string (cbd->addr));
+               if (cbd->session) {
+                       rspamd_mempool_t *pool = rspamd_session_mempool (cbd->session);
+                       msg_info_pool ("cannot connect to %s: %s",
+                                       rspamd_inet_address_to_string (cbd->addr),
+                                       strerror (errno));
+               }
+               else {
+                       msg_info ("cannot connect to %s: %s",
+                                       rspamd_inet_address_to_string (cbd->addr),
+                                       strerror (errno));
+               }
+
                return FALSE;
        }