Attachment 580274 Details for Bug 815887 – Call openlog whenever LVS_FLAG_SYSLOG is set

[patch] Call openlog whenever LVS_FLAG_SYSLOG is set

bz815887-2-nanny_nodaemon_openlog.patch (text/plain), 2.35 KB, created by Ryan O'Hara on 2012-04-25 20:35:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan O'Hara

Created: 2012-04-25 20:35:59 UTC

Size: 2.35 KB

patch

obsolete

>diff -urN piranha.orig/fos.c piranha/fos.c
>--- piranha.orig/fos.c	2012-04-01 00:00:44.931735688 -0500
>+++ piranha/fos.c	2012-04-25 14:59:05.185691542 -0500
>@@ -65,6 +65,7 @@
> #include <sys/signal.h>
> #include <sys/wait.h>
> #include <unistd.h>
>+#include <syslog.h>
> 
> #include "globals.h"
> #include "lvsconfig.h"
>@@ -515,6 +516,10 @@
> 			return 0;
> 	}
> 
>+	if (flags & LVS_FLAG_SYSLOG) {
>+		openlog ("fos", LOG_PID, LOG_DAEMON);
>+	}
>+
> 	if (amMaster (config, flags))
> 		partnerAddress = config->backupServer;
> 	else
>diff -urN piranha.orig/lvsd.c piranha/lvsd.c
>--- piranha.orig/lvsd.c	2012-04-01 00:00:44.931735688 -0500
>+++ piranha/lvsd.c	2012-04-25 14:58:36.923693766 -0500
>@@ -113,6 +113,7 @@
> #include <sys/wait.h>
> #include <unistd.h>
> #include <assert.h>
>+#include <syslog.h>
> 
> #include "globals.h"
> #include "lvsconfig.h"
>@@ -1250,6 +1251,11 @@
> 	return 0;
>     }
> 
>+  if (flags & LVS_FLAG_SYSLOG)
>+    {
>+      openlog ("lvsd", LOG_PID, LOG_DAEMON);
>+    }
>+
>   sigemptyset (&sigs);
>   sigaddset (&sigs, SIGINT);
>   sigaddset (&sigs, SIGCHLD);
>diff -urN piranha.orig/nanny.c piranha/nanny.c
>--- piranha.orig/nanny.c	2012-04-01 00:00:44.931735688 -0500
>+++ piranha/nanny.c	2012-04-25 14:58:50.084755657 -0500
>@@ -147,6 +147,7 @@
> #include <time.h>
> #include <sys/types.h>
> #include <regex.h>
>+#include <syslog.h>
> 
> #include "globals.h"
> #include "util.h"
>@@ -1601,6 +1602,11 @@
> 			exit (0);
> 	}
> 
>+	if (flags & LVS_FLAG_SYSLOG)
>+	  {
>+	    openlog ("nanny", LOG_PID, LOG_DAEMON);
>+	  }
>+
> 	countThresh = reentryTime / interval;
> 
> 	specifiedRM = routingMethod;
>diff -urN piranha.orig/pulse.c piranha/pulse.c
>--- piranha.orig/pulse.c	2012-04-01 00:00:44.931735688 -0500
>+++ piranha/pulse.c	2012-04-25 14:57:44.142755687 -0500
>@@ -131,6 +131,7 @@
> #include <unistd.h>
> #include <pwd.h>
> #include <setjmp.h>
>+#include <syslog.h>
> 
> #include "globals.h"
> #include "lvsconfig.h"
>@@ -2800,6 +2801,10 @@
> 	exit (0);
>     }
> 
>+  if (flags & LVS_FLAG_SYSLOG)
>+    {
>+      openlog ("pulse", LOG_PID, LOG_DAEMON);
>+    }
> 
>   if (master)
>     {
>diff -urN piranha.orig/util.c piranha/util.c
>--- piranha.orig/util.c	2012-04-01 00:00:44.931735688 -0500
>+++ piranha/util.c	2012-04-25 14:58:03.706736581 -0500
>@@ -120,9 +120,6 @@
> 	}
>     }
> 
>-  if (flags & LVS_FLAG_SYSLOG)
>-    openlog (name, LOG_PID, LOG_DAEMON);
>-
>   if (!(flags & LVS_FLAG_NOPIDFILE))
>     {
>       sprintf (pidFile, "/var/run/%s.pid", name);

Actions: View | Diff

Attachments on bug 815887: 579988 | 580274