On connect to server, show local ip and port

diff --git a/src/objects.c b/src/objects.c
index b1ec5b947a641fbbc4e20d95a3973a2a0dad594a..d56dcd82ca2da67470d30387a02c1bb760572d53 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -833,8 +833,7 @@ static void connect_server(struct PgSocket *server, const struct sockaddr *sa, i
                pga_copy(&server->remote_addr, sa);
        }
 
-       if (cf_log_connections)
-               slog_info(server, "new connection to server");
+       slog_debug(server, "launching new connection to server");
 
        /* start connecting */
        res = sbuf_connect(&server->sbuf, sa, salen,

diff --git a/src/server.c b/src/server.c
index c79052ac16d207875c7f9fd0d18b3184c08016ce..cb2a115ea4fa358f0f8dc1bdbd906d7a8dbb3df4 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -316,9 +316,18 @@ static bool handle_connect(PgSocket *server)
 {
        bool res = false;
        PgPool *pool = server->pool;
+       char buf[PGADDR_BUF + 32];
 
        fill_local_addr(server, sbuf_socket(&server->sbuf), pga_is_unix(&server->remote_addr));
 
+       if (cf_log_connections) {
+               if (pga_is_unix(&server->remote_addr))
+                       slog_info(server, "new connection to server");
+               else
+                       slog_info(server, "new connection to server (from %s)",
+                                 pga_str(&server->local_addr, buf, sizeof(buf)));
+       }
+
        if (!statlist_empty(&pool->cancel_req_list)) {
                slog_debug(server, "use it for pending cancel req");
                /* if pending cancel req, send it */

diff --git a/src/util.c b/src/util.c
index bb676189a2da8547b6a13a82c991d30d0222bdb5..5af06f1f2b6a5b1a51a4ce00b26219f2bf99e620 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -443,6 +443,9 @@ const char *pga_str(const PgAddr *a, char *dst, int dstlen)
 {
        char buf[PGADDR_BUF];
        pga_ntop(a, buf, sizeof(buf));
-       snprintf(dst, dstlen, "%s@%d", buf, pga_port(a));
+       if (pga_family(a) == AF_INET6)
+               snprintf(dst, dstlen, "[%s]:%d", buf, pga_port(a));
+       else
+               snprintf(dst, dstlen, "%s:%d", buf, pga_port(a));
        return dst;
 }