rpms/haproxy/EL-4 haproxy-1.3-error-reporting.patch, NONE, 1.1 haproxy.spec, 1.10, 1.11

[Jeremy Hinegardner]

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18226

Modified Files:
	haproxy.spec 
Added Files:
	haproxy-1.3-error-reporting.patch 
Log Message:
apply upstream error reporting patch

haproxy-1.3-error-reporting.patch:

--- NEW FILE haproxy-1.3-error-reporting.patch ---
>From 304d6fb00fe32fca1bd932a301d4afb7d54c92bc Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w at 1wt.eu>
Date: Sun, 16 Nov 2008 07:40:34 +0100
Subject: [PATCH] [BUG] critical errors should be reported even in daemon mode

Josh Goebel reported that haproxy silently dies when it fails to
chroot. In fact, it does so when in daemon mode, because daemon
mode has been disabling output for ages.

Since the code has been reworked, this could have been changed
because there is no reason for this anymore, hence this patch.
---
 src/haproxy.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/haproxy.c b/src/haproxy.c
index 50b013b..3eedfce 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -895,11 +895,6 @@ int main(int argc, char **argv)
 	signal(SIGTTOU, sig_pause);
 	signal(SIGTTIN, sig_listen);
 
-	if (global.mode & MODE_DAEMON) {
-		global.mode &= ~MODE_VERBOSE;
-		global.mode |= MODE_QUIET;
-	}
-
 	/* MODE_QUIET can inhibit alerts and warnings below this line */
 
 	global.mode &= ~MODE_STARTING;
@@ -1061,10 +1056,11 @@ int main(int argc, char **argv)
 		 * it would have already be done, and 0-2 would have been affected to listening
 		 * sockets
 		 */
-		if (!(global.mode & MODE_QUIET)) {
+		if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) {
 			/* detach from the tty */
 			fclose(stdin); fclose(stdout); fclose(stderr);
 			close(0); close(1); close(2); /* close all fd's */
+			global.mode &= ~MODE_VERBOSE;
 			global.mode |= MODE_QUIET; /* ensure that we won't say anything from now */
 		}
 		pid = getpid(); /* update child's pid */
-- 
1.5.5.1



Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- haproxy.spec	15 Nov 2008 22:29:28 -0000	1.10
+++ haproxy.spec	22 Nov 2008 20:58:12 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.14.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -17,6 +17,8 @@
 Source1:        %{name}.init
 Source2:        %{name}.cfg
 
+Patch0:         haproxy-1.3-error-reporting.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .error-reporting
 
 %build
 # No configure script is present, it is all done via make flags
@@ -125,6 +128,9 @@
 
 
 %changelog
+* Sat Nov 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.10-3
+- apply upstream patches
+
 * Sat Nov 15 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.10-2
 - rebuilt