[master] f9ea7e3 Fix the logging of warnings during applying tcp_fastopen and accept_filter params

Martin Blix Grydeland martin at varnish-software.com
Mon Mar 5 13:51:07 UTC 2018


commit f9ea7e34a1fba0621ffa4c0036dafb8282a118ec
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Feb 28 11:56:12 2018 +0100

    Fix the logging of warnings during applying tcp_fastopen and accept_filter params
    
    These were logged with a vxid==socket, which is wrong (leftover from old
    logging). They are now logged with vxid==0, which is for non-transactional
    messages.

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 398998b..a617581 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -627,7 +627,7 @@ ccf_start(struct cli *cli, const char * const *av, void *priv)
 			int i;
 			i = VTCP_fastopen(ls->sock, cache_param->listen_depth);
 			if (i)
-				VSL(SLT_Error, ls->sock,
+				VSL(SLT_Error, 0,
 				    "Kernel TCP Fast Open: sock=%d, ret=%d %s",
 				    ls->sock, i, strerror(errno));
 		}
@@ -637,7 +637,7 @@ ccf_start(struct cli *cli, const char * const *av, void *priv)
 			int i;
 			i = VTCP_filter_http(ls->sock);
 			if (i)
-				VSL(SLT_Error, ls->sock,
+				VSL(SLT_Error, 0,
 				    "Kernel filtering: sock=%d, ret=%d %s",
 				    ls->sock, i, strerror(errno));
 		}


More information about the varnish-commit mailing list