dev-zero 14/06/19 09:52:25 Added: nginx.logrotate-r1 check_1.7.2+.patch Log: Version bump (bug #508810), including fixes for bugs #508650 (delaycompress for logrotate) and #510040 (use /usr/$(get_libdir)). Thanks to jbergstroem for providing the bump, testing and patching. (Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x1A5D023975B0583D!)
Revision Changes Path 1.1 www-servers/nginx/files/nginx.logrotate-r1 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.logrotate-r1?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.logrotate-r1?rev=1.1&content-type=text/plain Index: nginx.logrotate-r1 =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate-r1,v 1.1 2014/06/19 09:52:24 dev-zero Exp $ /var/log/nginx/*_log { missingok delaycompress sharedscripts postrotate test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid` endscript } 1.1 www-servers/nginx/files/check_1.7.2+.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/check_1.7.2+.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/check_1.7.2+.patch?rev=1.1&content-type=text/plain Index: check_1.7.2+.patch =================================================================== commit 21116e1c0bba730ca59327ffba9320bc63f11462 Author: Johan Bergström <[email protected]> Date: Thu Jun 19 10:17:22 2014 +1000 Add support for upstream_check to nginx 1.7.2 diff --git src/http/modules/ngx_http_upstream_ip_hash_module.c src/http/modules/ngx_http_upstream_ip_hash_module.c index 148d73a..be9e03d 100644 --- src/http/modules/ngx_http_upstream_ip_hash_module.c +++ src/http/modules/ngx_http_upstream_ip_hash_module.c @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> +#if (NGX_UPSTREAM_CHECK_MODULE) +#include "ngx_http_upstream_check_handler.h" +#endif typedef struct { /* the round robin data must be first */ @@ -212,6 +215,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) goto next_try; } +#if (NGX_UPSTREAM_CHECK_MODULE) + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "get ip_hash peer, check_index: %ui", + peer->check_index); + if (ngx_http_check_peer_down(peer->check_index)) { + goto next_try; + } +#endif + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) diff --git src/http/modules/ngx_http_upstream_least_conn_module.c src/http/modules/ngx_http_upstream_least_conn_module.c index dbef95d..14e9e40 100644 --- src/http/modules/ngx_http_upstream_least_conn_module.c +++ src/http/modules/ngx_http_upstream_least_conn_module.c @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> +#if (NGX_UPSTREAM_CHECK_MODULE) +#include "ngx_http_upstream_check_handler.h" +#endif typedef struct { ngx_uint_t *conns; @@ -203,6 +206,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) continue; } +#if (NGX_UPSTREAM_CHECK_MODULE) + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "get least_conn peer, check_index: %ui", + peer->check_index); + + if (ngx_http_check_peer_down(peer->check_index)) { + continue; + } +#endif + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) @@ -256,6 +269,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) continue; } +#if (NGX_UPSTREAM_CHECK_MODULE) + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, + "get least_conn peer, check_index: %ui", + peer->check_index); + + if (ngx_http_check_peer_down(peer->check_index)) { + continue; + } +#endif + if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) { continue; } diff --git src/http/ngx_http_upstream_round_robin.c src/http/ngx_http_upstream_round_robin.c index 37c835c..43ccdcf 100644 --- src/http/ngx_http_upstream_round_robin.c +++ src/http/ngx_http_upstream_round_robin.c @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> +#if (NGX_UPSTREAM_CHECK_MODULE) +#include "ngx_http_upstream_check_handler.h" +#endif static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer( ngx_http_upstream_rr_peer_data_t *rrp); @@ -88,6 +91,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, peer[n].fail_timeout = server[i].fail_timeout; peer[n].down = server[i].down; peer[n].server = server[i].name; +#if (NGX_UPSTREAM_CHECK_MODULE) + if (!server[i].down) { + peers->peer[n].check_index = + ngx_http_check_add_peer(cf, us, &server[i].addrs[j]); + } else { + peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR; + } +#endif n++; } } @@ -144,6 +155,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, peer[n].fail_timeout = server[i].fail_timeout; peer[n].down = server[i].down; peer[n].server = server[i].name; +#if (NGX_UPSTREAM_CHECK_MODULE) + if (!server[i].down) { + backup->peer[n].check_index = + ngx_http_check_add_peer(cf, us, &server[i].addrs[j]); + } + else { + backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR; + } +#endif n++; } } @@ -203,6 +223,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, peer[i].current_weight = 0; peer[i].max_fails = 1; peer[i].fail_timeout = 10; +#if (NGX_UPSTREAM_CHECK_MODULE) + peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; +#endif } us->peer.data = peers; @@ -312,7 +335,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, peer[0].current_weight = 0; peer[0].max_fails = 1; peer[0].fail_timeout = 10; - +#if (NGX_UPSTREAM_CHECK_MODULE) + peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR; +#endif } else { for (i = 0; i < ur->naddrs; i++) { @@ -352,6 +377,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, peer[i].current_weight = 0; peer[i].max_fails = 1; peer[i].fail_timeout = 10; +#if (NGX_UPSTREAM_CHECK_MODULE) + peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR; +#endif } } @@ -411,6 +439,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) goto failed; } +#if (NGX_UPSTREAM_CHECK_MODULE) + if (ngx_http_check_peer_down(peer->check_index)) { + goto failed; + } +#endif + } else { /* there are several peers */ @@ -508,6 +542,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp) continue; } +#if (NGX_UPSTREAM_CHECK_MODULE) + if (ngx_http_check_peer_down(peer->check_index)) { + continue; + } +#endif + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) diff --git src/http/ngx_http_upstream_round_robin.h src/http/ngx_http_upstream_round_robin.h index 9db82a6..2fedd46 100644 --- src/http/ngx_http_upstream_round_robin.h +++ src/http/ngx_http_upstream_round_robin.h @@ -31,6 +31,10 @@ typedef struct { ngx_uint_t max_fails; time_t fail_timeout; +#if (NGX_UPSTREAM_CHECK_MODULE) + ngx_uint_t check_index; +#endif + ngx_uint_t down; /* unsigned down:1; */ #if (NGX_HTTP_SSL)
