some mild restart-type HUP cleanup

... only those things that were obvious (and puzzled people looking at
the code without konwing the subtle issues of HUP ;)).

3 files changed, 14 insertions, 64 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index 84178fd5..2e37edf2 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -93,7 +93,7 @@ DEFobjCurrIf(net)
 DEFobjCurrIf(rule)
 DEFobjCurrIf(ruleset)
 
-static int iNbrActions; /* number of actions the running config has. Needs to be init on ReInitConf() */
+static int iNbrActions = 0; /* number of currently defined actions */
 
 /* The following global variables are used for building
  * tag and host selector lines during startup and config reload.
@@ -1204,21 +1204,6 @@ cfline(uchar *line, rule_t **pfCurr)
 }
 
 
-/* Reinitialize the configuration subsystem. This is a "work-around" to the fact
- * that we do not yet have actual config objects. This method is to be called
- * whenever a totally new config is started (which means on startup and HUP).
- * Note that it MUST NOT be called for an included config file.
- * rgerhards, 2008-07-28
- */
-static rsRetVal
-ReInitConf(void)
-{
-	DEFiRet;
-	iNbrActions = 0;	/* this is what we created the function for ;) - action count is reset */
-	RETiRet;
-}
-
-
 /* return the current number of active actions
  * rgerhards, 2008-07-28
  */
@@ -1252,7 +1237,6 @@ CODESTARTobjQueryInterface(conf)
 	pIf->doIncludeLine = doIncludeLine;
 	pIf->cfline = cfline;
 	pIf->processConfFile = processConfFile;
-	pIf->ReInitConf = ReInitConf;
 	pIf->GetNbrActActions = GetNbrActActions;
 
 finalize_it:
diff --git a/runtime/conf.h b/runtime/conf.h
index 25b887be..6db1623e 100644
--- a/runtime/conf.h
+++ b/runtime/conf.h
@@ -37,10 +37,12 @@ BEGINinterface(conf) /* name must also be changed in ENDinterface macro! */
 	rsRetVal (*doIncludeLine)(uchar **pp, __attribute__((unused)) void* pVal);
 	rsRetVal (*cfline)(uchar *line, rule_t **pfCurr);
 	rsRetVal (*processConfFile)(uchar *pConfFile);
-	rsRetVal (*ReInitConf)(void);
 	rsRetVal (*GetNbrActActions)(int *);
 ENDinterface(conf)
-#define confCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */
+#define confCURR_IF_VERSION 3 /* increment whenever you change the interface structure! */
+/* in Version 3, entry point "ReInitConf()" was removed, as we do not longer need
+ * to support restart-type HUP -- rgerhards, 2009-07-15
+ */
 
 
 /* prototypes */
diff --git a/tools/syslogd.c b/tools/syslogd.c
index f9b8adef..804259d1 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2136,13 +2136,12 @@ startInputModules(void)
 }
 
 
-/* INIT -- Initialize syslogd from configuration table
- * init() is called at initial startup AND each time syslogd is HUPed
+/* INIT -- Initialize syslogd
  * Note that if iConfigVerify is set, only the config file is verified but nothing
  * else happens. -- rgerhards, 2008-07-28
  */
 static rsRetVal
-init()
+init(void)
 {
 	rsRetVal localRet;
 	int iNbrActions;
@@ -2153,8 +2152,6 @@ init()
 	struct sigaction sigAct;
 	DEFiRet;
 
-	thrdTerminateAll(); /* stop all running input threads - TODO: reconsider location! */
-
 	/* initialize some static variables */
 	pDfltHostnameCmp = NULL;
 	pDfltProgNameCmp = NULL;
@@ -2162,37 +2159,6 @@ init()
 
 	DBGPRINTF("rsyslog %s - called init()\n", VERSION);
 
-	/* delete the message queue, which also flushes all messages left over */
-	if(pMsgQueue != NULL) {
-		DBGPRINTF("deleting main message queue\n");
-		qqueueDestruct(&pMsgQueue); /* delete pThis here! */
-		pMsgQueue = NULL;
-	}
-
-	/*  Close all open log files and free log descriptor array. This also frees
-	 *  all output-modules instance data.
-	 */
-	destructAllActions();
-
-	/* Unload all non-static modules */
-	DBGPRINTF("Unloading non-static modules.\n");
-	module.UnloadAndDestructAll(eMOD_LINK_DYNAMIC_LOADED);
-
-	DBGPRINTF("Clearing templates.\n");
-	tplDeleteNew();
-
-	/* re-setting values to defaults (where applicable) */
-	/* once we have loadable modules, we must re-visit this code. The reason is
-	 * that config variables are not re-set, because the module is not yet loaded. On
-	 * the other hand, that doesn't matter, because the module got unloaded and is then
-	 * re-loaded, so the variables should be re-set via that way. And this is exactly how
-	 * it works. Loadable module's variables are initialized on load, the rest here.
-	 * rgerhards, 2008-04-28
-	 */
-	conf.cfsysline((uchar*)"ResetConfigVariables");
-
-	conf.ReInitConf();
-
 	/* construct the default ruleset */
 	ruleset.Construct(&pRuleset);
 	ruleset.SetName(pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset"));
@@ -2357,6 +2323,13 @@ init()
 		dbgPrintInitInfo();
 	}
 
+	memset(&sigAct, 0, sizeof (sigAct));
+	sigemptyset(&sigAct.sa_mask);
+	sigAct.sa_handler = sighup_handler;
+	sigaction(SIGHUP, &sigAct, NULL);
+
+	DBGPRINTF(" started.\n");
+
 	/* we now generate the startup message. It now includes everything to
 	 * identify this instance. -- rgerhards, 2005-08-17
 	 */
@@ -2366,13 +2339,6 @@ init()
 		 (int) myPid);
 	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)bufStartUpMsg, 0);
 
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-	sigAct.sa_handler = sighup_handler;
-	sigaction(SIGHUP, &sigAct, NULL);
-
-	DBGPRINTF(" started.\n");
-
 finalize_it:
 	RETiRet;
 }
@@ -2805,8 +2771,6 @@ static rsRetVal mainThread()
 	runInputModules();
 
 	/* END OF INTIALIZATION
-	 * ... but keep in mind that we might do a restart and thus init() might
-	 * be called again. -- rgerhards, 2005-10-24
 	 */
 	DBGPRINTF("initialization completed, transitioning to regular run mode\n");