Mercurial > hg > nginx-ranges
diff src/http/modules/ngx_http_limit_req_module.c @ 544:f7ec98e3caeb NGINX_0_8_18
nginx 0.8.18
*) Feature: the "read_ahead" directive.
*) Feature: now several "perl_modules" directive may be used.
*) Feature: the "limit_req_log_level" and "limit_conn_log_level"
directives.
*) Bugfix: now "limit_req" directive conforms to the leaky bucket
algorithm.
Thanks to Maxim Dounin.
*) Bugfix: nginx did not work on Linux/sparc.
Thanks to Marcus Ramberg.
*) Bugfix: nginx sent '\0' in a "Location" response header line on
MKCOL request.
Thanks to Xie Zhenye.
*) Bugfix: zero status code was logged instead of 499 status code; the
bug had appeared in 0.8.11.
*) Bugfix: socket leak; the bug had appeared in 0.8.11.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 06 Oct 2009 00:00:00 +0400 |
parents | e8b686f230a8 |
children | a52c99698e7f |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_limit_req_module.c +++ b/src/http/modules/ngx_http_limit_req_module.c @@ -42,7 +42,10 @@ typedef struct { ngx_shm_zone_t *shm_zone; /* integer value, 1 corresponds to 0.001 r/s */ ngx_uint_t burst; - ngx_uint_t nodelay;/* unsigned nodelay:1 */ + ngx_uint_t limit_log_level; + ngx_uint_t delay_log_level; + + ngx_uint_t nodelay; /* unsigned nodelay:1 */ } ngx_http_limit_req_conf_t; @@ -62,6 +65,15 @@ static char *ngx_http_limit_req(ngx_conf static ngx_int_t ngx_http_limit_req_init(ngx_conf_t *cf); +static ngx_conf_enum_t ngx_http_limit_req_log_levels[] = { + { ngx_string("info"), NGX_LOG_INFO }, + { ngx_string("notice"), NGX_LOG_NOTICE }, + { ngx_string("warn"), NGX_LOG_WARN }, + { ngx_string("error"), NGX_LOG_ERR }, + { ngx_null_string, 0 } +}; + + static ngx_command_t ngx_http_limit_req_commands[] = { { ngx_string("limit_req_zone"), @@ -78,6 +90,13 @@ static ngx_command_t ngx_http_limit_req 0, NULL }, + { ngx_string("limit_req_log_level"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_enum_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_limit_req_conf_t, limit_log_level), + &ngx_http_limit_req_log_levels }, + ngx_null_command }; @@ -186,7 +205,7 @@ ngx_http_limit_req_handler(ngx_http_requ if (rc == NGX_BUSY) { ngx_shmtx_unlock(&ctx->shpool->mutex); - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + ngx_log_error(lrcf->limit_log_level, r->connection->log, 0, "limiting requests, excess: %ui.%03ui by zone \"%V\"", excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name); @@ -200,7 +219,7 @@ ngx_http_limit_req_handler(ngx_http_requ return NGX_DECLINED; } - ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, + ngx_log_error(lrcf->delay_log_level, r->connection->log, 0, "delaying request, excess: %ui.%03ui, by zone \"%V\"", excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name); @@ -379,6 +398,11 @@ ngx_http_limit_req_lookup(ngx_http_limit excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000; + if ((ngx_uint_t) excess > lrcf->burst) { + *lrp = lr; + return NGX_BUSY; + } + if (excess < 0) { excess = 0; } @@ -388,10 +412,6 @@ ngx_http_limit_req_lookup(ngx_http_limit *lrp = lr; - if ((ngx_uint_t) excess > lrcf->burst) { - return NGX_BUSY; - } - if (excess) { return NGX_AGAIN; } @@ -548,6 +568,8 @@ ngx_http_limit_req_create_conf(ngx_conf_ * conf->nodelay = 0; */ + conf->limit_log_level = NGX_CONF_UNSET_UINT; + return conf; } @@ -562,6 +584,12 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *conf = *prev; } + ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, + NGX_LOG_ERR); + + conf->delay_log_level = (conf->limit_log_level == NGX_LOG_INFO) ? + NGX_LOG_INFO : conf->limit_log_level + 1; + return NGX_CONF_OK; }