bugfix and testbench improvement

made shutdown more reliable by makeing sure that the main queue DA worker
is only cancelled if this is actually unavoidable. Also moved down the
deletion of rsyslogd's pid file to immediately before termination, so
that absence of the file is a proper indication that rsyslogd has
finished (in the past, e.g. the testbench accidently ran two intances
as the pid file was deleted too early). Also some improvments to the
testbench, namely to handle aborts more intelligently (but still not
perfect).

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/syslogd.c b/tools/syslogd.c
index bd2d107f..3350804d 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1733,8 +1733,6 @@ die(int sig)
 	 */
 	tplDeleteAll();
 
-	remove_pid(PidFile);
-
 	/* de-init some modules */
 	modExitIminternal();
 
@@ -1768,6 +1766,9 @@ die(int sig)
 	 */
 	freeAllDynMemForTermination();
 	/* NO CODE HERE - feeelAllDynMemForTermination() must be the last thing before exit()! */
+
+	remove_pid(PidFile);
+
 	exit(0); /* "good" exit, this is the terminator function for rsyslog [die()] */
 }