Merge of r4886, r4887, r4894: log variables generalization:
*) Log: $apache_bytes_sent removed. It was renamed to $body_bytes_sent in nginx 0.3.10 and the old name is deprecated since then. *) Variable $bytes_sent. It replicates variable $bytes_sent as previously available in log module only. Patch by Benjamin Grössing (with minor changes). *) Variables $connection and $connection_requests. Log module counterparts are removed as they aren't used often and there is no need to preserve them for efficiency.
This commit is contained in:
Maxim Dounin
parent
c6276b4150
commit
5e727f5775
|
|
@ -78,10 +78,6 @@ static void ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log,
|
|||
static ssize_t ngx_http_log_script_write(ngx_http_request_t *r,
|
||||
ngx_http_log_script_t *script, u_char **name, u_char *buf, size_t len);
|
||||
|
||||
static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
|
||||
ngx_http_log_op_t *op);
|
||||
static u_char *ngx_http_log_connection_requests(ngx_http_request_t *r,
|
||||
u_char *buf, ngx_http_log_op_t *op);
|
||||
static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
|
||||
ngx_http_log_op_t *op);
|
||||
static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
|
||||
|
|
@ -194,9 +190,6 @@ static ngx_str_t ngx_http_combined_fmt =
|
|||
|
||||
|
||||
static ngx_http_log_var_t ngx_http_log_vars[] = {
|
||||
{ ngx_string("connection"), NGX_ATOMIC_T_LEN, ngx_http_log_connection },
|
||||
{ ngx_string("connection_requests"), NGX_INT_T_LEN,
|
||||
ngx_http_log_connection_requests },
|
||||
{ ngx_string("pipe"), 1, ngx_http_log_pipe },
|
||||
{ ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1,
|
||||
ngx_http_log_time },
|
||||
|
|
@ -209,8 +202,6 @@ static ngx_http_log_var_t ngx_http_log_vars[] = {
|
|||
{ ngx_string("bytes_sent"), NGX_OFF_T_LEN, ngx_http_log_bytes_sent },
|
||||
{ ngx_string("body_bytes_sent"), NGX_OFF_T_LEN,
|
||||
ngx_http_log_body_bytes_sent },
|
||||
{ ngx_string("apache_bytes_sent"), NGX_OFF_T_LEN,
|
||||
ngx_http_log_body_bytes_sent },
|
||||
{ ngx_string("request_length"), NGX_SIZE_T_LEN,
|
||||
ngx_http_log_request_length },
|
||||
|
||||
|
|
@ -501,22 +492,6 @@ ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf,
|
|||
}
|
||||
|
||||
|
||||
static u_char *
|
||||
ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
|
||||
ngx_http_log_op_t *op)
|
||||
{
|
||||
return ngx_sprintf(buf, "%uA", r->connection->number);
|
||||
}
|
||||
|
||||
|
||||
static u_char *
|
||||
ngx_http_log_connection_requests(ngx_http_request_t *r, u_char *buf,
|
||||
ngx_http_log_op_t *op)
|
||||
{
|
||||
return ngx_sprintf(buf, "%ui", r->connection->requests);
|
||||
}
|
||||
|
||||
|
||||
static u_char *
|
||||
ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op)
|
||||
{
|
||||
|
|
@ -1143,12 +1118,6 @@ ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
|
|||
goto invalid;
|
||||
}
|
||||
|
||||
if (ngx_strncmp(var.data, "apache_bytes_sent", 17) == 0) {
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"use \"$body_bytes_sent\" instead of "
|
||||
"\"$apache_bytes_sent\"");
|
||||
}
|
||||
|
||||
for (v = ngx_http_log_vars; v->name.len; v++) {
|
||||
|
||||
if (v->name.len == var.len
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ static ngx_int_t ngx_http_variable_request_method(ngx_http_request_t *r,
|
|||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_remote_user(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_bytes_sent(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_body_bytes_sent(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_request_completion(ngx_http_request_t *r,
|
||||
|
|
@ -95,6 +97,11 @@ static ngx_int_t ngx_http_variable_sent_keep_alive(ngx_http_request_t *r,
|
|||
static ngx_int_t ngx_http_variable_sent_transfer_encoding(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
|
||||
static ngx_int_t ngx_http_variable_connection(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_connection_requests(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
|
||||
static ngx_int_t ngx_http_variable_nginx_version(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_variable_hostname(ngx_http_request_t *r,
|
||||
|
|
@ -212,6 +219,9 @@ static ngx_http_variable_t ngx_http_core_variables[] = {
|
|||
|
||||
{ ngx_string("remote_user"), NULL, ngx_http_variable_remote_user, 0, 0, 0 },
|
||||
|
||||
{ ngx_string("bytes_sent"), NULL, ngx_http_variable_bytes_sent,
|
||||
0, 0, 0 },
|
||||
|
||||
{ ngx_string("body_bytes_sent"), NULL, ngx_http_variable_body_bytes_sent,
|
||||
0, 0, 0 },
|
||||
|
||||
|
|
@ -260,6 +270,12 @@ static ngx_http_variable_t ngx_http_core_variables[] = {
|
|||
offsetof(ngx_http_request_t, limit_rate),
|
||||
NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
|
||||
|
||||
{ ngx_string("connection"), NULL,
|
||||
ngx_http_variable_connection, 0, 0, 0 },
|
||||
|
||||
{ ngx_string("connection_requests"), NULL,
|
||||
ngx_http_variable_connection_requests, 0, 0, 0 },
|
||||
|
||||
{ ngx_string("nginx_version"), NULL, ngx_http_variable_nginx_version,
|
||||
0, 0, 0 },
|
||||
|
||||
|
|
@ -1433,6 +1449,27 @@ ngx_http_variable_remote_user(ngx_http_request_t *r,
|
|||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_variable_bytes_sent(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
{
|
||||
u_char *p;
|
||||
|
||||
p = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
|
||||
if (p == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
v->len = ngx_sprintf(p, "%O", r->connection->sent) - p;
|
||||
v->valid = 1;
|
||||
v->no_cacheable = 0;
|
||||
v->not_found = 0;
|
||||
v->data = p;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_variable_body_bytes_sent(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
|
|
@ -1787,6 +1824,48 @@ ngx_http_variable_request_body_file(ngx_http_request_t *r,
|
|||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_variable_connection(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
{
|
||||
u_char *p;
|
||||
|
||||
p = ngx_pnalloc(r->pool, NGX_ATOMIC_T_LEN);
|
||||
if (p == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
v->len = ngx_sprintf(p, "%uA", r->connection->number) - p;
|
||||
v->valid = 1;
|
||||
v->no_cacheable = 0;
|
||||
v->not_found = 0;
|
||||
v->data = p;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_variable_connection_requests(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
{
|
||||
u_char *p;
|
||||
|
||||
p = ngx_pnalloc(r->pool, NGX_INT_T_LEN);
|
||||
if (p == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
v->len = ngx_sprintf(p, "%ui", r->connection->requests) - p;
|
||||
v->valid = 1;
|
||||
v->no_cacheable = 0;
|
||||
v->not_found = 0;
|
||||
v->data = p;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_variable_nginx_version(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
|
|
|
|||
Loading…
Reference in New Issue