search

cep21 / healthcheck_nginx_upstreams

Health checks upstreams for nginx
http://wiki.nginx.org/NginxHttpHealthcheckModule
253 stars 599 forks source link

Patch fails against ngx_http_upstream_round_robin.c #1

Closed AdamIsrael closed 14 years ago

AdamIsrael commented 14 years ago

Hey,

I'm trying to apply this to the latest stable release of nginx and having issues getting the patch to apply cleanly.

nginx-0.7.65 $ patch -p1 --dry-run < modules/healthcheck_nginx_upstreams/nginx.patch patching file src/http/ngx_http_upstream.c Hunk #1 succeeded at 4153 (offset 7 lines). patching file src/http/ngx_http_upstream.h Hunk #1 succeeded at 105 with fuzz 2 (offset -6 lines). can't find file to patch at input line 54 Perhaps you used the wrong -p or --strip option? The text leading up to this was:

--- src/http/ngx_http_upstream_round_robin.c.orig Mon Mar 8 20:55:32 2010 +++ src/http/ngx_http_upstream_round_robin.c Mon Mar 8 21:03:17 2010

File to patch:

For what it's worth, I get the same error trying to run this against 0.7.62, so maybe I'm doing something wrong. I'm not familiar enough with patch to patch this myself quickly.

Thanks, Adam

cep21 commented 14 years ago

Thanks for the bug report. That patch is new so it could be the patch's fault. I'll look at it some time in the next few days. If you want to take a crack at it yourself, the patch is pretty simple. Otherwise I'll get to it soon.

I'm pretty sure this version will work though: http://github.com/cep21/healthcheck_nginx_upstreams/commit/aa5d5c22236590e20acdc8bb6993e0d60bb16b85

It just won't have upstream_round_robin support.

PiotrSikora commented 14 years ago

It seems that it was my bad (my additions were level 0 patches, not level 1). I already fixed this in my fork, so it should be pulled here shortly.

cep21 commented 14 years ago

Thanks Piotr. The master branch is merged in with your fixes. AdamIsrael, pull and let me know if this helps.

AdamIsrael commented 14 years ago

All fixed and working! Thanks a bunch!