# HG changeset patch
# User Nils Hermansson <3tnica@gmail.com>
# Date 1445625283 -7200
# Fri Oct 23 20:34:43 2015 +0200
# Node ID 868fc6b3bf69be611118c597578e749c65698b8c
# Parent ee16fb0db905cfb858a929374cf623cdf1a0f9d3
Most standard syslog facilicties do not expect hostname when logging to
Unix Sockets.
This patch removes hostname from syslog message when logging to Unix Socket.
Tested on rsyslog and syslog-ng

diff -r ee16fb0db905 -r 868fc6b3bf69 src/core/ngx_syslog.c
--- a/src/core/ngx_syslog.c Tue Oct 20 21:28:38 2015 +0300
+++ b/src/core/ngx_syslog.c Fri Oct 23 20:34:43 2015 +0200
@@ -219,9 +219,17 @@
ngx_uint_t pri;

pri = peer->facility * 8 + peer->severity;
-
- return ngx_sprintf(buf, "<%ui>%V %V %V: ", pri,
&ngx_cached_syslog_time,
+#if (NGX_HAVE_UNIX_DOMAIN)
+ if (peer->server.sockaddr->sa_family == AF_UNIX) {
+ return ngx_sprintf(buf, "<%ui>%V %V: ", pri,
&ngx_cached_syslog_time,
+ &peer->tag);
+ } else {
+#endif
+ return ngx_sprintf(buf, "<%ui>%V %V %V: ", pri,
&ngx_cached_syslog_time,
&ngx_cycle->hostname, &peer->tag);
+#if (NGX_HAVE_UNIX_DOMAIN)
+ }
+#endif
}
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel