mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-04 22:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The limit_req_status and limit_conn_status directives.

Browse Source 
Patch by Nick Marden, with minor changes.
This commit is contained in:
Maxim Dounin 2013-03-18 14:50:29 +00:00
parent 5a7661e581
commit d7db87e6d9
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/modules/ngx_http_limit_conn_module.c
View File

@ -40,6 +40,7 @@ typedef struct {
typedef struct { typedef struct {
ngx_array_t limits; ngx_array_t limits;
ngx_uint_t log_level; ngx_uint_t log_level;
ngx_uint_t status_code;
} ngx_http_limit_conn_conf_t; } ngx_http_limit_conn_conf_t;
@ -74,6 +75,11 @@ static ngx_conf_enum_t ngx_http_limit_conn_log_levels[] = {
}; };
static ngx_conf_num_bounds_t ngx_http_limit_conn_status_bounds = {
ngx_conf_check_num_bounds, 400, 599
};
static ngx_command_t ngx_http_limit_conn_commands[] = { static ngx_command_t ngx_http_limit_conn_commands[] = {
{ ngx_string("limit_conn_zone"), { ngx_string("limit_conn_zone"),
@ -104,6 +110,13 @@ static ngx_command_t ngx_http_limit_conn_commands[] = {
offsetof(ngx_http_limit_conn_conf_t, log_level), offsetof(ngx_http_limit_conn_conf_t, log_level),
&ngx_http_limit_conn_log_levels }, &ngx_http_limit_conn_log_levels },
{ ngx_string("limit_conn_status"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_limit_conn_conf_t, status_code),
&ngx_http_limit_conn_status_bounds },
ngx_null_command ngx_null_command
}; };
@ -206,7 +219,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
if (node == NULL) { if (node == NULL) {
ngx_shmtx_unlock(&shpool->mutex); ngx_shmtx_unlock(&shpool->mutex);
ngx_http_limit_conn_cleanup_all(r->pool); ngx_http_limit_conn_cleanup_all(r->pool);
return NGX_HTTP_SERVICE_UNAVAILABLE; return lccf->status_code;
} }
lc = (ngx_http_limit_conn_node_t *) &node->color; lc = (ngx_http_limit_conn_node_t *) &node->color;
@ -231,7 +244,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
&limits[i].shm_zone->shm.name); &limits[i].shm_zone->shm.name);
ngx_http_limit_conn_cleanup_all(r->pool); ngx_http_limit_conn_cleanup_all(r->pool);
return NGX_HTTP_SERVICE_UNAVAILABLE; return lccf->status_code;
} }
lc->conn++; lc->conn++;
@ -467,6 +480,7 @@ ngx_http_limit_conn_create_conf(ngx_conf_t *cf)
*/ */
conf->log_level = NGX_CONF_UNSET_UINT; conf->log_level = NGX_CONF_UNSET_UINT;
conf->status_code = NGX_CONF_UNSET_UINT;
return conf; return conf;
} }
@ -483,6 +497,8 @@ ngx_http_limit_conn_merge_conf(ngx_conf_t *cf, void *parent, void *child)
} }
ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);
ngx_conf_merge_uint_value(conf->status_code, prev->status_code,
NGX_HTTP_SERVICE_UNAVAILABLE);
return NGX_CONF_OK; return NGX_CONF_OK;
} }

19
src/http/modules/ngx_http_limit_req_module.c
View File

@ -53,6 +53,7 @@ typedef struct {
ngx_array_t limits; ngx_array_t limits;
ngx_uint_t limit_log_level; ngx_uint_t limit_log_level;
ngx_uint_t delay_log_level; ngx_uint_t delay_log_level;
ngx_uint_t status_code;
} ngx_http_limit_req_conf_t; } ngx_http_limit_req_conf_t;
@ -84,6 +85,11 @@ static ngx_conf_enum_t ngx_http_limit_req_log_levels[] = {
}; };
static ngx_conf_num_bounds_t ngx_http_limit_req_status_bounds = {
ngx_conf_check_num_bounds, 400, 599
};
static ngx_command_t ngx_http_limit_req_commands[] = { static ngx_command_t ngx_http_limit_req_commands[] = {
{ ngx_string("limit_req_zone"), { ngx_string("limit_req_zone"),
@ -107,6 +113,13 @@ static ngx_command_t ngx_http_limit_req_commands[] = {
offsetof(ngx_http_limit_req_conf_t, limit_log_level), offsetof(ngx_http_limit_req_conf_t, limit_log_level),
&ngx_http_limit_req_log_levels }, &ngx_http_limit_req_log_levels },
{ ngx_string("limit_req_status"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_limit_req_conf_t, status_code),
&ngx_http_limit_req_status_bounds },
ngx_null_command ngx_null_command
}; };
@ -245,7 +258,7 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
ctx->node = NULL; ctx->node = NULL;
} }
return NGX_HTTP_SERVICE_UNAVAILABLE; return lrcf->status_code;
} }
/* rc == NGX_AGAIN || rc == NGX_OK */ /* rc == NGX_AGAIN || rc == NGX_OK */
@ -682,6 +695,7 @@ ngx_http_limit_req_create_conf(ngx_conf_t *cf)
*/ */
conf->limit_log_level = NGX_CONF_UNSET_UINT; conf->limit_log_level = NGX_CONF_UNSET_UINT;
conf->status_code = NGX_CONF_UNSET_UINT;
return conf; return conf;
} }
@ -703,6 +717,9 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child)
conf->delay_log_level = (conf->limit_log_level == NGX_LOG_INFO) ? conf->delay_log_level = (conf->limit_log_level == NGX_LOG_INFO) ?
NGX_LOG_INFO : conf->limit_log_level + 1; NGX_LOG_INFO : conf->limit_log_level + 1;
ngx_conf_merge_uint_value(conf->status_code, prev->status_code,
NGX_HTTP_SERVICE_UNAVAILABLE);
return NGX_CONF_OK; return NGX_CONF_OK;
} }