Apply ngx_stream_log_module

This commit is contained in:
u5surf 2025-02-15 00:34:04 +09:00
parent 8cfe0dc05a
commit d1a3fb9a29

View File

@ -260,10 +260,18 @@ ngx_stream_log_handler(ngx_stream_session_t *s)
if (log[l].syslog_peer) { if (log[l].syslog_peer) {
/* length of syslog's PRI and HEADER message parts */ /* length of syslog's PRI and HEADER message parts */
len += sizeof("<255>Jan 01 00:00:00 ") - 1 if (log[l].syslog_peer->is_rfc5424) {
+ ngx_cycle->hostname.len + 1 u_char pid[32];
+ log[l].syslog_peer->tag.len + 2; ngx_sprintf(pid, "%d", ngx_pid);
len += sizeof("<255>1 1970-01-01T00:00:00.000Z ") - 1
+ ngx_cycle->hostname.len + 1
+ sizeof("nginx ") - 1
+ ngx_strlen(pid) + 5;
} else {
len += sizeof("<255>Jan 01 00:00:00 ") - 1
+ ngx_cycle->hostname.len + 1
+ log[l].syslog_peer->tag.len + 2;
}
goto alloc_line; goto alloc_line;
} }
@ -315,7 +323,9 @@ ngx_stream_log_handler(ngx_stream_session_t *s)
p = line; p = line;
if (log[l].syslog_peer) { if (log[l].syslog_peer) {
p = ngx_syslog_add_header(log[l].syslog_peer, line); p = (log[l].syslog_peer->is_rfc5424) ?
ngx_syslog_add_header_rfc5424(log[l].syslog_peer, line)
: ngx_syslog_add_header(log[l].syslog_peer, line);
} }
for (i = 0; i < log[l].format->ops->nelts; i++) { for (i = 0; i < log[l].format->ops->nelts; i++) {