On 10/20/13 00:04, Pavel Levshin wrote:
Hello.
I've found minor problem with imuxsock (HEAD version from git). When
syssock.use set to off, the module is unable to create additional
listeners. See patch attached.
Hello Pavel,
that was actually fallout of one of my commits[1], sorry about that. The
reason for the change was to suppress warnings if there are no sockets
configured. The current issue is that your fix[2] brought back the
original behavior.
Attached is a patch for v7-devel that should suppress the warnings in a
clean way. Review would be appreciated.
Tomas
[1] http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=6138ced6
[2] http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=d77a8b1b
>From 0c6e44d7e4f80662892d6c21b999ef9362d42598 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <[email protected]>
Date: Fri, 17 Jan 2014 12:12:57 +0100
Subject: [PATCH] imuxsock: don't issue a warning if there are no sockets
configured
---
plugins/imuxsock/imuxsock.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 107c944..040a5b7 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1290,6 +1290,10 @@ CODESTARTactivateCnfPrePrivDrop
for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
++nLstn;
}
+ if(runModConf->bOmitLocalLogging && nLstn == 0) {
+ /* No sockets were configured, no reason to run. */
+ ABORT_FINALIZE(RS_RET_OK);
+ }
if(nLstn > 0) {
DBGPRINTF("imuxsock: allocating memory for %d addtl listeners\n", nLstn);
CHKmalloc(listeners = realloc(listeners, (1+nLstn)*sizeof(lstn_t)));
@@ -1340,6 +1344,7 @@ BEGINrunInput
CODESTARTrunInput
if(runModConf->bOmitLocalLogging && nfd == 1)
+ /* No sockets were configured, no reason to run. */
ABORT_FINALIZE(RS_RET_OK);
/* this is an endless loop - it is terminated when the thread is
* signalled to do so. This, however, is handled by the framework,
--
1.8.4.3
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
