From ab24b2efffc235c6625a52ebbb56afd94c067f6f Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Tue, 25 Sep 2018 10:10:28 +0200 Subject: [PATCH] Add configurable retry timeout for remote syslog servers Signed-off-by: Joachim Nilsson --- configure.ac | 10 ++++++++++ src/syslogd.c | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7eb2181..012447a 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,10 @@ AC_HEADER_STDC # Check for required packages PKG_PROG_PKG_CONFIG +AC_ARG_WITH(suspend-time, + AS_HELP_STRING([--with-suspend-time=SEC], [Retry timeout for remote syslogd servers, default: 180]), + [suspend_time=$withval], [suspend_time='no']) + AC_ARG_WITH(klogd-delay, AS_HELP_STRING([--with-klogd-delay=SEC], [when started at the same time as syslogd, default: 0]), [klogd_delay=$withval], [klogd_delay='no']) @@ -43,6 +47,12 @@ AC_ARG_WITH(systemd, [AS_HELP_STRING([--with-systemd=DIR], [Directory for systemd service files])],, [with_systemd=auto]) +AS_IF([test "x$suspend_time" != "xno"],[ + AS_IF([test "x$suspend_time" = "xyes"],[ + AC_MSG_ERROR([Must supply argument])]) + ] + AC_DEFINE_UNQUOTED(INET_SUSPEND_TIME, $suspend_time, [Retry timeout for remote syslgod servers, default: 180])) + AS_IF([test "x$klogd_delay" != "xno"],[ AS_IF([test "x$klogd_delay" = "xyes"],[ AC_MSG_ERROR([Must supply argument])]) diff --git a/src/syslogd.c b/src/syslogd.c index 4a178be..cd269b5 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -1965,8 +1965,7 @@ void fprintlog(struct filed *f, char *from, int flags, char *msg) logit(" %s\n", f->f_un.f_forw.f_hname); logit("Forwarding suspension not over, time " "left: %d.\n", - INET_SUSPEND_TIME - - fwd_suspend); + INET_SUSPEND_TIME - fwd_suspend); } break;