Mercurial > hg > nginx
changeset 2752:2d82d3cfbfa0
change ngx_log_abort() interface
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 24 Apr 2009 15:50:51 +0000 |
| parents | 3b9b67bc0cdc |
| children | 9ba1bee1b1e4 |
| files | src/core/ngx_log.c src/core/ngx_log.h |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -207,10 +207,19 @@ ngx_log_debug_core(ngx_log_t *log, ngx_e #endif -void -ngx_log_abort(ngx_err_t err, const char *text, void *param) +void ngx_cdecl +ngx_log_abort(ngx_err_t err, const char *fmt, ...) { - ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, text, param); + u_char *p; + va_list args; + u_char errstr[NGX_MAX_CONF_ERRSTR]; + + va_start(args, fmt); + p = ngx_vsnprintf(errstr, sizeof(errstr) - 1, fmt, args); + va_end(args); + + ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, + "%*s", p - errstr, errstr); }
--- a/src/core/ngx_log.h +++ b/src/core/ngx_log.h @@ -198,7 +198,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_lo ngx_log_t *ngx_log_init(void); ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_str_t *name); char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log); -void ngx_log_abort(ngx_err_t err, const char *text, void *param); +void ngx_cdecl ngx_log_abort(ngx_err_t err, const char *fmt, ...); void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...);