diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-31 02:33:57 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-31 02:33:57 +0300 |
| commit | 00ef9ff5f03ce7e98ba64c3644da25e5a0d659fc (patch) | |
| tree | 626c5e25054a4d4f96e58efd2da07343ae58bd80 /src/core | |
| parent | 53fec2c4149028c8d30ce58d79674502358da773 (diff) | |
| download | nginx-00ef9ff5f03ce7e98ba64c3644da25e5a0d659fc.tar.gz | |
Fixed logging.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_cycle.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_file.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_slab.c | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 28231697c..e69acb571 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -1510,7 +1510,7 @@ ngx_load_module(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%i", + ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%ui", module->name, module->index); } diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 5785eb5b5..87cb62ed0 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -1313,7 +1313,7 @@ ngx_clean_old_cycles(ngx_event_t *ev) if (cycle[i]->connections[n].fd != (ngx_socket_t) -1) { found = 1; - ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%d", n); + ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%ui", n); break; } @@ -1324,13 +1324,13 @@ ngx_clean_old_cycles(ngx_event_t *ev) continue; } - ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %d", i); + ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %ui", i); ngx_destroy_pool(cycle[i]->pool); cycle[i] = NULL; } - ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %d", live); + ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %ui", live); if (live) { ngx_add_timer(ev, 30000); diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 6c16e2056..fc2dfd322 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -841,7 +841,7 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf) if ((size_t) n != len) { ngx_log_error(NGX_LOG_ALERT, cf->log, 0, - ngx_read_fd_n " has read only %z of %uz from %s", + ngx_read_fd_n " has read only %z of %O from %s", n, size, from); goto failed; } @@ -856,7 +856,7 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf) if ((size_t) n != len) { ngx_log_error(NGX_LOG_ALERT, cf->log, 0, - ngx_write_fd_n " has written only %z of %uz to %s", + ngx_write_fd_n " has written only %z of %O to %s", n, size, to); goto failed; } diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index fa2a64637..56e7765c0 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -392,7 +392,8 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size) done: - ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab alloc: %p", p); + ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, + "slab alloc: %p", (void *) p); return (void *) p; } |