commit syslog-ng

29 May 2006

Hello community,

here is the log from the commit of package syslog-ng
checked in at Mon May 29 22:19:01 CEST 2006.

--------

--- syslog-ng/syslog-ng.changes	2006-04-10 15:26:55.000000000 +0200
+++ syslog-ng/syslog-ng.changes	2006-05-29 19:23:41.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 29 18:59:26 CEST 2006 - mt@suse.de
+
+- Bug #177961: Added patch to avoid startup failure in case
+  the initial connect to a unix socket destination fails.
+  Instead, reinit the driver after time_reopen secs (option).
+  New patch file: syslog-ng-afunix_dest_reconnect.dif
+
+-------------------------------------------------------------------

New:
----
  syslog-ng-afunix_dest_reconnect.dif

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.GlyWhM/_old	2006-05-29 22:18:39.000000000 +0200
+++ /var/tmp/diff_new_pack.GlyWhM/_new	2006-05-29 22:18:39.000000000 +0200
@@ -13,7 +13,7 @@
 Name:           syslog-ng
 BuildRequires:  gperf libol-devel tcpd-devel
 Version:        1.6.8
-Release:        15
+Release:        20
 License:        GPL
 Group:          System/Daemons
 Summary:        new-generation syslog-daemon
@@ -34,6 +34,7 @@
 #Patch0:         syslog-ng-%{version}.dif
 Patch1:         syslog-ng-afunix_no_hostname.dif
 Patch2:         syslog-ng-update_own_hostname.dif
+Patch3:         syslog-ng-afunix_dest_reconnect.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -66,6 +67,7 @@
 #%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 %{?suse_update_config:%{suse_update_config}}
 
 %build
@@ -227,6 +229,11 @@
 /var/adm/fillup-templates/sysconfig.syslog-ng
 
 %changelog -n syslog-ng
+* Mon May 29 2006 - mt@suse.de
+- Bug #177961: Added patch to avoid startup failure in case
+  the initial connect to a unix socket destination fails.
+  Instead, reinit the driver after time_reopen secs (option).
+  New patch file: syslog-ng-afunix_dest_reconnect.dif
 * Mon Apr 10 2006 - mt@suse.de
 - Bug #150052: added aaa_base to RPM PreReq to avoid failure
   of the run_suseconfig macro when yast2 directory installer


++++++ syslog-ng-afunix_dest_reconnect.dif ++++++
--- src/afunix.c
+++ src/afunix.c	2006/05/29 16:54:31
@@ -413,7 +413,16 @@ static int do_init_afunix_dest(struct lo
 		CAST(unix_address_info, unix_addr, self->super.dest_addr);
 
 		close(fd);
-		werror("Error connecting to AF_UNIX(%S): %z\n", unix_addr->path, strerror(errno));
+		if(self->cfg->time_reopen) {
+			io_callout(self->cfg->backend,
+				   self->cfg->time_reopen,
+				   make_driver_reinit
+				   (&self->super.super.super, self->cfg));
+
+			return ST_OK | ST_GOON;
+		}
+		werror("Error connecting to AF_UNIX socket (%S): %z\n",
+		       unix_addr->path, strerror(errno));
 	}
 	return ST_FAIL | ST_QUIT;
 }








++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)