From 27ee1b988a465e5f89e8a9234f4a01c34cab4387 Mon Sep 17 00:00:00 2001 From: wangshouping Date: Mon, 27 Apr 2020 08:53:18 -0400 Subject: [PATCH] print main queue info to journal when receive USR1 signal V-2: add macro control for systemd/sd-journal.h V-3: adapt pMsgQueue to runConf->pMsgQueue Signed-off-by: wangshouping Signed-off-by: pengyi37 --- tools/rsyslogd.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c index 31b91a1..b92aca5 100644 --- a/tools/rsyslogd.c +++ b/tools/rsyslogd.c @@ -36,6 +36,7 @@ #endif #ifdef HAVE_LIBSYSTEMD # include +#include #endif #include "rsyslog.h" @@ -182,6 +183,9 @@ static pthread_mutex_t mutChildDied; static int bChildDied = 0; static pthread_mutex_t mutHadHUP; static int bHadHUP; +#ifdef HAVE_LIBSYSTEMD +static int g_bRecordQueue; +#endif static int doFork = 1; /* fork - run in daemon mode - read-only after startup */ int bFinished = 0; /* used by termination signal handler, read-only except there * is either 0 or the number of the signal that requested the @@ -1294,9 +1298,16 @@ rsyslogdDebugSwitch(void) dbgprintf("\n"); debugging_on = 0; } + } +#ifdef HAVE_LIBSYSTEMD +static void RsyslogdDebugQueue(void) +{ + g_bRecordQueue = 1; +} +#endif /* This is the main entry point into rsyslogd. Over time, we should try to * modularize it a bit more... * @@ -1629,7 +1640,11 @@ initAll(int argc, char **argv) hdlr_enable(SIGINT, rsyslogdDoDie); hdlr_enable(SIGQUIT, rsyslogdDoDie); } else { +#ifdef HAVE_LIBSYSTEMD + hdlr_enable(SIGUSR1, RsyslogdDebugQueue); +#else hdlr_enable(SIGUSR1, SIG_IGN); +#endif hdlr_enable(SIGINT, SIG_IGN); hdlr_enable(SIGQUIT, SIG_IGN); } @@ -1971,6 +1986,9 @@ mainloop(void) sigaddset(&sigblockset, SIGTERM); sigaddset(&sigblockset, SIGCHLD); sigaddset(&sigblockset, SIGHUP); +#ifdef HAVE_LIBSYSTEMD + sigaddset(&sigblockset, SIGUSR1); +#endif do { pthread_sigmask(SIG_BLOCK, &sigblockset, &origmask); @@ -2000,6 +2018,18 @@ mainloop(void) processImInternal(); +#ifdef HAVE_LIBSYSTEMD + if (g_bRecordQueue) { + if (runConf->pMsgQueue != NULL) { + sd_journal_print(LOG_NOTICE, "main queue size information: current QueueSize=%d MaxQeueSize=%d\n", + runConf->pMsgQueue->iQueueSize, runConf->pMsgQueue->iMaxQueueSize); + } else { + sd_journal_print(LOG_NOTICE, "main queue size information: pMsgQueue is NULL!\n"); + } + g_bRecordQueue = 0; + } +#endif + if(bFinished) break; /* exit as quickly as possible */ -- 2.27.0