rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 16:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more (very mild) cleanup

Browse Source
This commit is contained in:
Rainer Gerhards 2009-07-15 14:28:33 +02:00
parent 46dc3f6d64
commit 05cd77cd4d
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/wti.c
View File

@ -452,7 +452,6 @@ wtiWorker(wti_t *pThis)
d_pthread_mutex_lock(&pThis->mut); d_pthread_mutex_lock(&pThis->mut);
pthread_cleanup_pop(0); /* remove cleanup handler */ pthread_cleanup_pop(0); /* remove cleanup handler */
RUNLOG_STR("XXX: Worker shutdown");
pWtp->pfOnWorkerShutdown(pWtp->pUsr); pWtp->pfOnWorkerShutdown(pWtp->pUsr);
wtiSetState(pThis, eWRKTHRD_TERMINATING, 0, MUTEX_ALREADY_LOCKED); wtiSetState(pThis, eWRKTHRD_TERMINATING, 0, MUTEX_ALREADY_LOCKED);

12
tools/syslogd.c
View File

@ -422,7 +422,7 @@ diagGetMainMsgQSize(int *piSize)
/* rgerhards, 2005-10-24: crunch_list is called only during option processing. So /* rgerhards, 2005-10-24: crunch_list is called only during option processing. So
* it is never called once rsyslogd is running (not even when HUPed). This code * it is never called once rsyslogd is running. This code
* contains some exits, but they are considered safe because they only happen * contains some exits, but they are considered safe because they only happen
* during startup. Anyhow, when we review the code here, we might want to * during startup. Anyhow, when we review the code here, we might want to
* reconsider the exit()s. * reconsider the exit()s.
@ -1719,16 +1719,6 @@ die(int sig)
/* terminate the remaining classes */ /* terminate the remaining classes */
GlobalClassExit(); GlobalClassExit();
/* TODO: this would also be the right place to de-init the builtin output modules. We
* do not currently do that, because the module interface does not allow for
* it. This will come some time later (it's essential with loadable modules).
* For the time being, this is a memory leak on exit, but as the process is
* terminated, we do not really bother about it.
* rgerhards, 2007-08-03
* I have added some code now, but all that mod init/de-init should be moved to
* init, so that modules are unloaded and reloaded on HUP to. Eventually it should go
* into destructAllActions() - but that needs to be seen. -- rgerhards, 2007-08-09
*/
module.UnloadAndDestructAll(eMOD_LINK_ALL); module.UnloadAndDestructAll(eMOD_LINK_ALL);
DBGPRINTF("Clean shutdown completed, bye\n"); DBGPRINTF("Clean shutdown completed, bye\n");