From 0cf0aeae2fc8e0f2be53d2b93b55055ad1a7d112 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 15 Nov 2013 15:52:42 +0100 Subject: doc: fix glitch in v6+ parameter description --- doc/imuxsock.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/imuxsock.html b/doc/imuxsock.html index e89a67aa..74e96a9a 100644 --- a/doc/imuxsock.html +++ b/doc/imuxsock.html @@ -94,7 +94,8 @@ burst in number of messages. Default is 200.
  • SysSock.RateLimit.Severity [numerical severity] - specifies the severity of messages that shall be rate-limited.
    • -
  • SysSock.UseSysTimeStamp [on/off] the same as $InputUnixListenSocketUseSysTimeStamp, but for the system log socket. +
  • SysSock.UseSysTimeStamp [on/off] the same as the input parameter +UseSysTimeStamp, but for the system log socket. See description there.
  • SysSock.Annotate <on/off> turn on annotation/trusted properties for the system log socket.
    • -- cgit v1.2.3 From c9eb2138b757f418f8950c39282be78985a911dc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 15 Nov 2013 15:57:23 +0100 Subject: doc typo fix --- doc/imuxsock.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/imuxsock.html b/doc/imuxsock.html index 74e96a9a..123771fa 100644 --- a/doc/imuxsock.html +++ b/doc/imuxsock.html @@ -145,7 +145,7 @@ be obtained from the log socket itself. If so, the TAG part of the message is re It is recommended to turn this option on, but the default is "off" to keep compatible with earlier versions of rsyslog.
  • UseSysTimeStamp [on/off] instructs imuxsock -to obtain message time from the system (via control messages) insted of using time +to obtain message time from the system (via control messages) instead of using time recorded inside the message. This may be most useful in combination with systemd. Note: this option was introduced with version 5.9.1. Due to the usefulness of it, we decided to enable it by default. As such, 5.9.1 and above behave slightly different -- cgit v1.2.3 From 2666c6d71c4761d6fc01ff1647d5774d2cea02dc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 15 Nov 2013 17:09:09 +0100 Subject: bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly Thanks to Tomas Heinrich for alerting us and provinding a solution suggestion. --- ChangeLog | 3 +++ plugins/imuxsock/imuxsock.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9bcf932..035b8fc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ --------------------------------------------------------------------------- Version 7.4.7 [v7.4-stable] 2013-11-?? +- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly + Thanks to Tomas Heinrich for alerting us and provinding a solution + suggestion. - bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work Thanks to Tomas Heinrich for the patch. - improved checking of queue config parameters on startup diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 1c4ba472..df504dd6 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -402,7 +402,7 @@ addListner(instanceConf_t *inst) listeners[nfd].flags = inst->bIgnoreTimestamp ? IGNDATE : NOFLAG; listeners[nfd].bCreatePath = inst->bCreatePath; listeners[nfd].sockName = ustrdup(inst->sockName); - listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate) ? 1 : 0; + listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate || inst->bUseSysTimeStamp) ? 1 : 0; listeners[nfd].bAnnotate = inst->bAnnotate; listeners[nfd].bParseTrusted = inst->bParseTrusted; listeners[nfd].bDiscardOwnMsgs = inst->bDiscardOwnMsgs; @@ -993,7 +993,7 @@ static rsRetVal readSocket(lstn_t *pLstn) if(iRcvd > 0) { cred = NULL; ts = NULL; - if(pLstn->bUseCreds || pLstn->bUseSysTimeStamp) { + if(pLstn->bUseCreds) { for(cm = CMSG_FIRSTHDR(&msgh); cm; cm = CMSG_NXTHDR(&msgh, cm)) { # if HAVE_SCM_CREDENTIALS if( pLstn->bUseCreds @@ -1063,7 +1063,7 @@ activateListeners() listeners[0].ratelimitInterval = runModConf->ratelimitIntervalSysSock; listeners[0].ratelimitBurst = runModConf->ratelimitBurstSysSock; listeners[0].ratelimitSev = runModConf->ratelimitSeveritySysSock; - listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs) ? 1 : 0; + listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs || runModConf->bUseSysTimeStamp) ? 1 : 0; listeners[0].bWritePid = runModConf->bWritePidSysSock; listeners[0].bAnnotate = runModConf->bAnnotateSysSock; listeners[0].bParseTrusted = runModConf->bParseTrusted; -- cgit v1.2.3