Log local port to make it easier to correlate logs with the server

Change-Id: Ic641bd5e784148fbfa4f91c5b0eabc4c341d0f96
Reviewed-on: https://review.couchbase.org/c/libcouchbase/+/232671
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>

Author: avsej

src/ctx-log-inl.h

@@ -16,7 +16,7 @@
  */
 
 /* small utility for retrieving host/port information from the CTX */
-static const lcb_host_t *get_ctx_host(const lcbio_CTX *ctx)
+static const lcb_host_t *get_ctx_host_remote(const lcbio_CTX *ctx)
 {
     static lcb_host_t host = {"NOHOST", "NOPORT", 0};
     if (!ctx) {
@@ -31,10 +31,26 @@ static const lcb_host_t *get_ctx_host(const lcbio_CTX *ctx)
     return &ctx->sock->info->ep_remote;
 }
 
-#define CTX_LOGFMT_PRE "<" LCB_LOG_SPEC("%s%s%s:%s") "> (CTX=%p,%s"
+static const lcb_host_t *get_ctx_host_local(const lcbio_CTX *ctx)
+{
+    static lcb_host_t host = {"NOHOST", "NOPORT", 0};
+    if (!ctx) {
+        return &host;
+    }
+    if (!ctx->sock) {
+        return &host;
+    }
+    if (!ctx->sock->info) {
+        return &host;
+    }
+    return &ctx->sock->info->ep_local;
+}
+
+#define CTX_LOGFMT_PRE "<" LCB_LOG_SPEC("%s:%s%s%s:%s") "> (CTX=%p,%s"
 #define CTX_LOGFMT CTX_LOGFMT_PRE ") "
 #define CTX_LOGID(ctx)                                                                                                 \
-    (ctx && ctx->sock && ctx->sock->settings->log_redaction) ? LCB_LOG_SD_OTAG : "",                                   \
-        (get_ctx_host(ctx)->ipv6 ? "[" : ""), get_ctx_host(ctx)->host, (get_ctx_host(ctx)->ipv6 ? "]" : ""),           \
-        get_ctx_host(ctx)->port, (ctx && ctx->sock && ctx->sock->settings->log_redaction) ? LCB_LOG_SD_CTAG : "",      \
-        (void *)ctx, ctx ? ctx->subsys : ""
+    (ctx && ctx->sock && ctx->sock->settings->log_redaction) ? LCB_LOG_SD_OTAG : "", get_ctx_host_local(ctx)->port,    \
+        (get_ctx_host_remote(ctx)->ipv6 ? "[" : ""), get_ctx_host_remote(ctx)->host,                                   \
+        (get_ctx_host_remote(ctx)->ipv6 ? "]" : ""), get_ctx_host_remote(ctx)->port,                                   \
+        (ctx && ctx->sock && ctx->sock->settings->log_redaction) ? LCB_LOG_SD_CTAG : "", (void *)ctx,                  \
+        ctx ? ctx->subsys : ""

src/lcbio/connect.cc

@@ -30,7 +30,7 @@ using namespace lcb::io;
 #define EAI_SYSTEM 0
 #endif
 #define LOGARGS(conn, lvl) conn->settings, "connection", LCB_LOG_##lvl, __FILE__, __LINE__
-static const lcb_host_t *get_loghost(lcbio_SOCKET *s)
+static const lcb_host_t *get_loghost_remote(lcbio_SOCKET *s)
 {
     static lcb_host_t host = {"NOHOST", "NOPORT", 0};
     if (!s) {
@@ -41,13 +41,25 @@ static const lcb_host_t *get_loghost(lcbio_SOCKET *s)
     }
     return &s->info->ep_remote;
 }
+static const lcb_host_t *get_loghost_local(lcbio_SOCKET *s)
+{
+    static lcb_host_t host = {"NOHOST", "NOPORT", 0};
+    if (!s) {
+        return &host;
+    }
+    if (!s->info) {
+        return &host;
+    }
+    return &s->info->ep_local;
+}
 
 /** Format string arguments for %p%s:%s */
 #define CSLOGID(sock)                                                                                                  \
-    sock->settings->log_redaction ? LCB_LOG_SD_OTAG : "", get_loghost(sock)->ipv6 ? "[" : "", get_loghost(sock)->host, \
-        get_loghost(sock)->ipv6 ? "]" : "", get_loghost(sock)->port,                                                   \
+    sock->settings->log_redaction ? LCB_LOG_SD_OTAG : "", get_loghost_local(sock)->port,                               \
+        get_loghost_remote(sock)->ipv6 ? "[" : "", get_loghost_remote(sock)->host,                                     \
+        get_loghost_remote(sock)->ipv6 ? "]" : "", get_loghost_remote(sock)->port,                                     \
         sock->settings->log_redaction ? LCB_LOG_SD_CTAG : "", sock->id
-#define CSLOGFMT "<" LCB_LOG_SPEC("%s%s%s:%s") "> (SOCK=%016" PRIx64 ") "
+#define CSLOGFMT "<" LCB_LOG_SPEC("%s:%s%s%s:%s") "> (SOCK=%016" PRIx64 ") "
 
 #define LOGARGS_T(lvl) LOGARGS(this->sock, lvl)
 #define CSLOGID_T() CSLOGID(this->sock)