aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_syslog.h
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2023-03-10 07:43:40 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2023-03-10 07:43:40 +0300
commit853912986d9568b049ecb5499b6af987cb13cb14 (patch)
treedfedf3423b300e927cd14144da3f7b7246b25e86 /src/core/ngx_syslog.h
parentff9e426337b84ed1d9ff3bbd17e7d7632c7ba19d (diff)
downloadnginx-853912986d9568b049ecb5499b6af987cb13cb14.tar.gz
nginx-853912986d9568b049ecb5499b6af987cb13cb14.zip
Syslog: removed usage of ngx_cycle->log and ngx_cycle->hostname.
During initial startup the ngx_cycle->hostname is not available, and previously this resulted in incorrect logging. Instead, hostname from the configuration being parsed is now preserved in the syslog peer structure and then used during logging. Similarly, ngx_cycle->log might not match the configuration where the syslog peer is defined if the configuration is not yet fully applied, and previously this resulted in unexpected logging of syslog errors and debug information. Instead, cf->cycle->new_log is now referenced in the syslog peer structure and used for logging, similarly to how it is done in other modules.
Diffstat (limited to 'src/core/ngx_syslog.h')
-rw-r--r--src/core/ngx_syslog.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/core/ngx_syslog.h b/src/core/ngx_syslog.h
index 50dcd3511..181ebe7b3 100644
--- a/src/core/ngx_syslog.h
+++ b/src/core/ngx_syslog.h
@@ -9,14 +9,19 @@
typedef struct {
- ngx_uint_t facility;
- ngx_uint_t severity;
- ngx_str_t tag;
-
- ngx_addr_t server;
- ngx_connection_t conn;
- unsigned busy:1;
- unsigned nohostname:1;
+ ngx_uint_t facility;
+ ngx_uint_t severity;
+ ngx_str_t tag;
+
+ ngx_str_t *hostname;
+
+ ngx_addr_t server;
+ ngx_connection_t conn;
+
+ ngx_log_t *log;
+
+ unsigned busy:1;
+ unsigned nohostname:1;
} ngx_syslog_peer_t;