mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Events: fixed logging.

Browse Source
This commit is contained in:
Sergey Kandaurov 2016-03-31 02:33:55 +03:00
parent c622ff3b44
commit 53fec2c414
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event/modules/ngx_eventport_module.c
View File

@ -526,18 +526,18 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"eventport: fd:%d, ev:%04Xd", "eventport: fd:%d, ev:%04Xd",
event_list[i].portev_object, revents); (int) event_list[i].portev_object, revents);
if (revents & (POLLERR|POLLHUP|POLLNVAL)) { if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"port_getn() error fd:%d ev:%04Xd", "port_getn() error fd:%d ev:%04Xd",
event_list[i].portev_object, revents); (int) event_list[i].portev_object, revents);
} }
if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) { if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"strange port_getn() events fd:%d ev:%04Xd", "strange port_getn() events fd:%d ev:%04Xd",
event_list[i].portev_object, revents); (int) event_list[i].portev_object, revents);
} }
if ((revents & (POLLERR|POLLHUP|POLLNVAL)) if ((revents & (POLLERR|POLLHUP|POLLNVAL))
@ -615,7 +615,7 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
default: default:
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"unexpected eventport object %d", "unexpected eventport object %d",
event_list[i].portev_object); (int) event_list[i].portev_object);
continue; continue;
} }
} }

23
src/event/modules/ngx_kqueue_module.c
View File

@ -579,7 +579,7 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
if (event_list[i].flags & EV_ERROR) { if (event_list[i].flags & EV_ERROR) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, event_list[i].data, ngx_log_error(NGX_LOG_ALERT, cycle->log, event_list[i].data,
"kevent() error on %d filter:%d flags:%04Xd", "kevent() error on %d filter:%d flags:%04Xd",
event_list[i].ident, event_list[i].filter, (int) event_list[i].ident, event_list[i].filter,
event_list[i].flags); event_list[i].flags);
continue; continue;
} }
@ -676,13 +676,20 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
static ngx_inline void static ngx_inline void
ngx_kqueue_dump_event(ngx_log_t *log, struct kevent *kev) ngx_kqueue_dump_event(ngx_log_t *log, struct kevent *kev)
{ {
ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0, if (kev->ident > 0x8000000 && kev->ident != (unsigned) -1) {
(kev->ident > 0x8000000 && kev->ident != (unsigned) -1) ? ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
"kevent: %p: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p": "kevent: %p: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p",
"kevent: %d: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p", (void *) kev->ident, kev->filter,
kev->ident, kev->filter, kev->flags, kev->fflags,
kev->flags, kev->fflags, (int) kev->data, kev->udata);
kev->data, kev->udata);
} else {
ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
"kevent: %d: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p",
(int) kev->ident, kev->filter,
kev->flags, kev->fflags,
(int) kev->data, kev->udata);
}
} }