summaryrefslogtreecommitdiffstats
path: root/plugins/imuxsock
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-16 09:33:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-16 09:33:21 +0200
commitd9f1a16de4723f9e096fa9abe47e8a845c815df0 (patch)
tree222a519573840ca32a7fa05292a99da3ae7533f1 /plugins/imuxsock
parent5c0920c159dc76565af344d65d0aa57d62cc389a (diff)
downloadrsyslog-d9f1a16de4723f9e096fa9abe47e8a845c815df0.tar.gz
rsyslog-d9f1a16de4723f9e096fa9abe47e8a845c815df0.tar.xz
rsyslog-d9f1a16de4723f9e096fa9abe47e8a845c815df0.zip
improved input thread termination for imtcp and imuxsock
Diffstat (limited to 'plugins/imuxsock')
-rw-r--r--plugins/imuxsock/imuxsock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index b8546ce3..a85bc4ef 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -330,6 +330,8 @@ CODESTARTrunInput
break; /* terminate input! */
for (i = 0; i < nfunix && nfds > 0; i++) {
+ if(glbl.GetGlobalInputTermState() == 1)
+ ABORT_FINALIZE(RS_RET_FORCE_TERM); /* terminate input! */
if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
readSocket(fd, i);
--nfds; /* indicate we have processed one */
@@ -337,6 +339,7 @@ CODESTARTrunInput
}
}
+finalize_it:
RETiRet;
ENDrunInput