mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-20 05:00:42 +01:00
added $LogRSyslogStatusMessages configuration directive
...permitting to turn off rsyslog start/stop/HUP messages. See Debian ticket http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463793
This commit is contained in:
Rainer Gerhards
parent
5d24e7d835
commit
071c9b511a
@ -1,4 +1,9 @@
|
||||
---------------------------------------------------------------------------
|
||||
Version 4.7.0 [v4-devel] (rgerhards), 2009-09-??
|
||||
- added $LogRSyslogStatusMessages configuration directive
|
||||
permitting to turn off rsyslog start/stop/HUP messages. See Debian
|
||||
ticket http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463793
|
||||
---------------------------------------------------------------------------
|
||||
Version 4.5.3 [v4-beta] (rgerhards), 2009-08-??
|
||||
- bugfix: message sanitation had some issues:
|
||||
- control character DEL was not properly escaped
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.61)
|
||||
AC_INIT([rsyslog],[4.5.2],[rsyslog@lists.adiscon.com])
|
||||
AC_INIT([rsyslog],[4.7.0],[rsyslog@lists.adiscon.com])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_CONFIG_SRCDIR([ChangeLog])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
|
||||
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
|
||||
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
|
||||
project goals.</p>
|
||||
<p><b>This documentation is for version 4.5.2 (v4-beta branch) of rsyslog.</b>
|
||||
<p><b>This documentation is for version 4.7.0 (v4-devel branch) of rsyslog.</b>
|
||||
Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
|
||||
to obtain current version information and project status.
|
||||
</p><p><b>If you like rsyslog, you might
|
||||
|
||||
@ -146,6 +146,10 @@ Usually that should not be a big issue, as the restart-type HUP can easily be re
|
||||
something along the lines of "/etc/init.d/rsyslog restart".
|
||||
</li>
|
||||
<li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li><li>MainMsgQueueCheckpointInterval <number></li>
|
||||
<li><b>$LogRSyslogStatusMessages</b> [<b>on</b>/off] - If set to on (the default),
|
||||
rsyslog emits message on startup and shutdown as well as when it is HUPed.
|
||||
This information might be needed by some log analyzers. If set to off, no such
|
||||
status messages are logged, what may be useful for other scenarios.
|
||||
<li>$MainMsgQueueDequeueSlowdown <number> [number
|
||||
is timeout in <i> micro</i>seconds (1000000us is 1sec!),
|
||||
default 0 (no delay). Simple rate-limiting!]</li>
|
||||
|
||||
@ -249,6 +249,8 @@ int bDropTrailingLF = 1; /* drop trailing LF's on reception? */
|
||||
int iCompatibilityMode = 0; /* version we should be compatible with; 0 means sysklogd. It is
|
||||
the default, so if no -c<n> option is given, we make ourselvs
|
||||
as compatible to sysklogd as possible. */
|
||||
#define DFLT_bLogStatusMsgs 1
|
||||
static int bLogStatusMsgs = DFLT_bLogStatusMsgs; /* log rsyslog start/stop/HUP messages? */
|
||||
static int bDebugPrintTemplateList = 1;/* output template list in debug mode? */
|
||||
static int bDebugPrintCfSysLineHandlerList = 1;/* output cfsyslinehandler list in debug mode? */
|
||||
static int bDebugPrintModuleList = 1;/* output module list in debug mode? */
|
||||
@ -332,6 +334,7 @@ getFIOPName(unsigned iFIOP)
|
||||
static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal)
|
||||
{
|
||||
cCCEscapeChar = '#';
|
||||
bLogStatusMsgs = DFLT_bLogStatusMsgs;
|
||||
bActExecWhenPrevSusp = 0;
|
||||
iActExecOnceInterval = 0;
|
||||
bDebugPrintTemplateList = 1;
|
||||
@ -1659,7 +1662,7 @@ die(int sig)
|
||||
thrdTerminateAll();
|
||||
|
||||
/* and THEN send the termination log message (see long comment above) */
|
||||
if (sig) {
|
||||
if(sig && bLogStatusMsgs) {
|
||||
(void) snprintf(buf, sizeof(buf) / sizeof(char),
|
||||
" [origin software=\"rsyslogd\" " "swVersion=\"" VERSION \
|
||||
"\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"]" " exiting on signal %d.",
|
||||
@ -2353,11 +2356,13 @@ init()
|
||||
/* we now generate the startup message. It now includes everything to
|
||||
* identify this instance. -- rgerhards, 2005-08-17
|
||||
*/
|
||||
snprintf(bufStartUpMsg, sizeof(bufStartUpMsg)/sizeof(char),
|
||||
" [origin software=\"rsyslogd\" " "swVersion=\"" VERSION \
|
||||
"\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] (re)start",
|
||||
(int) myPid);
|
||||
logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)bufStartUpMsg, 0);
|
||||
if(bLogStatusMsgs) {
|
||||
snprintf(bufStartUpMsg, sizeof(bufStartUpMsg)/sizeof(char),
|
||||
" [origin software=\"rsyslogd\" " "swVersion=\"" VERSION \
|
||||
"\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] (re)start",
|
||||
(int) myPid);
|
||||
logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)bufStartUpMsg, 0);
|
||||
}
|
||||
|
||||
memset(&sigAct, 0, sizeof (sigAct));
|
||||
sigemptyset(&sigAct.sa_mask);
|
||||
@ -2506,12 +2511,14 @@ doHUP(void)
|
||||
{
|
||||
char buf[512];
|
||||
|
||||
snprintf(buf, sizeof(buf) / sizeof(char),
|
||||
" [origin software=\"rsyslogd\" " "swVersion=\"" VERSION
|
||||
"\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] rsyslogd was HUPed, type '%s'.",
|
||||
(int) myPid, glbl.GetHUPisRestart() ? "restart" : "lightweight");
|
||||
errno = 0;
|
||||
logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0);
|
||||
if(bLogStatusMsgs) {
|
||||
snprintf(buf, sizeof(buf) / sizeof(char),
|
||||
" [origin software=\"rsyslogd\" " "swVersion=\"" VERSION
|
||||
"\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] rsyslogd was HUPed, type '%s'.",
|
||||
(int) myPid, glbl.GetHUPisRestart() ? "restart" : "lightweight");
|
||||
errno = 0;
|
||||
logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0);
|
||||
}
|
||||
|
||||
if(glbl.GetHUPisRestart()) {
|
||||
DBGPRINTF("Received SIGHUP, configured to be restart, reloading rsyslogd.\n");
|
||||
@ -2632,6 +2639,7 @@ static rsRetVal loadBuildInModules(void)
|
||||
* is that rsyslog will terminate if we can not register our built-in config commands.
|
||||
* This, I think, is the right thing to do. -- rgerhards, 2007-07-31
|
||||
*/
|
||||
CHKiRet(regCfSysLineHdlr((uchar *)"logrsyslogstatusmessages", 0, eCmdHdlrBinary, NULL, &bLogStatusMsgs, NULL));
|
||||
CHKiRet(regCfSysLineHdlr((uchar *)"actionresumeretrycount", 0, eCmdHdlrInt, NULL, &glbliActionResumeRetryCount, NULL));
|
||||
CHKiRet(regCfSysLineHdlr((uchar *)"defaultruleset", 0, eCmdHdlrGetWord, setDefaultRuleset, NULL, NULL));
|
||||
CHKiRet(regCfSysLineHdlr((uchar *)"ruleset", 0, eCmdHdlrGetWord, setCurrRuleset, NULL, NULL));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user