Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7400

Browse Source
This commit is contained in:
Hakase
2018-11-22 10:14:23 +09:00
parent 6ee0f3383d
commit 44f2125a4c
11 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stream/ngx_stream_proxy_module.c
+9 -5
View File
@@ -690,7 +690,7 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
u->proxy_protocol = pscf->proxy_protocol;
if (u->state) {
u->state->response_time = ngx_current_msec - u->state->response_time;
u->state->response_time = ngx_current_msec - u->start_time;
}
u->state = ngx_array_push(s->upstream_states);
@@ -701,9 +701,11 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
ngx_memzero(u->state, sizeof(ngx_stream_upstream_state_t));
u->start_time = ngx_current_msec;
u->state->connect_time = (ngx_msec_t) -1;
u->state->first_byte_time = (ngx_msec_t) -1;
u->state->response_time = ngx_current_msec;
u->state->response_time = (ngx_msec_t) -1;
rc = ngx_event_connect_peer(&u->peer);
@@ -817,7 +819,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
}
}
u->state->connect_time = ngx_current_msec - u->state->response_time;
u->state->connect_time = ngx_current_msec - u->start_time;
if (u->peer.notify) {
u->peer.notify(&u->peer, u->peer.data,
@@ -1622,7 +1624,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
if (from_upstream) {
if (u->state->first_byte_time == (ngx_msec_t) -1) {
u->state->first_byte_time = ngx_current_msec
- u->state->response_time;
- u->start_time;
}
}
@@ -1857,7 +1859,9 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
pc = u->peer.connection;
if (u->state) {
u->state->response_time = ngx_current_msec - u->state->response_time;
if (u->state->response_time == (ngx_msec_t) -1) {
u->state->response_time = ngx_current_msec - u->start_time;
}
if (pc) {
u->state->bytes_received = u->received;
src/stream/ngx_stream_upstream.c
+7 -9
View File
@@ -267,24 +267,22 @@ ngx_stream_upstream_response_time_variable(ngx_stream_session_t *s,
for ( ;; ) {
if (data == 1) {
if (state[i].first_byte_time == (ngx_msec_t) -1) {
*p++ = '-';
goto next;
}
ms = state[i].first_byte_time;
} else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) {
} else if (data == 2) {
ms = state[i].connect_time;
} else {
ms = state[i].response_time;
}
ms = ngx_max(ms, 0);
p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
if (ms != -1) {
ms = ngx_max(ms, 0);
p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
next:
} else {
*p++ = '-';
}
if (++i == s->upstream_states->nelts) {
break;
src/stream/ngx_stream_upstream.h
+1
View File
@@ -130,6 +130,7 @@ typedef struct {
time_t start_sec;
ngx_uint_t requests;
ngx_uint_t responses;
ngx_msec_t start_time;
ngx_str_t ssl_name;