Attachment 579988 Details for Bug 815887 – Allow nanny to write to syslog when --nodaemon option is specified.

[patch] Allow nanny to write to syslog when --nodaemon option is specified.

bz815887-1-nanny_nodaemon_syslog.patch (text/plain), 1.09 KB, created by Ryan O'Hara on 2012-04-24 20:21:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan O'Hara

Created: 2012-04-24 20:21:35 UTC

Size: 1.09 KB

patch

obsolete

>diff -urN piranha.orig/nanny.c piranha/nanny.c
>--- piranha.orig/nanny.c	2012-04-24 13:27:04.509691997 -0500
>+++ piranha/nanny.c	2012-04-24 13:59:52.483695246 -0500
>@@ -1583,7 +1583,7 @@
>                 flags |= NANNY_FLAG_REGEX;
> 
> 	if (noDaemon)
>-		flags |= LVS_FLAG_PRINTF | LVS_FLAG_PRINTF;
>+		flags |= LVS_FLAG_PRINTF | LVS_FLAG_SYSLOG;
> 	else
> 		flags |= NANNY_FLAG_ASDAEMON | LVS_FLAG_SYSLOG;
> 
>diff -urN piranha.orig/util.c piranha/util.c
>--- piranha.orig/util.c	2009-10-02 08:30:28.000000000 -0500
>+++ piranha/util.c	2012-04-24 14:14:50.375735860 -0500
>@@ -80,20 +80,20 @@
> 
>   va_list args;
> 
>-  va_start (args, format);
>-
>   if (flags & LVS_FLAG_PRINTF)
>     {
>+      va_start (args, format);
>       vsnprintf (logmsg, sizeof(logmsg), format, args);
>       snprintf(totalmsg, sizeof(totalmsg), "%s: %s\n", name, logmsg);
>       write(STDOUT_FILENO, totalmsg, strlen(totalmsg));
>+      va_end (args);
>     }
>-  else if (flags & LVS_FLAG_SYSLOG)
>+  if (flags & LVS_FLAG_SYSLOG)
>     {
>+      va_start (args, format);
>       doSyslog (format, args);
>+      va_end (args);
>     }
>-
>-  va_end (args);
> }
> 
>

Actions: View | Diff

Attachments on bug 815887: 579988 | 580274