diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 14:38:23 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 14:38:23 +0200 |
commit | 8eb888d049da12e1294a7688432b6325794ade32 (patch) | |
tree | 6f9ba40f5d01406c36a38690ec13d55a37f52596 | |
parent | 02f768c37dac9dde424bbd31e378482750fc276c (diff) | |
download | rsyslog-8eb888d049da12e1294a7688432b6325794ade32.tar.gz rsyslog-8eb888d049da12e1294a7688432b6325794ade32.tar.xz rsyslog-8eb888d049da12e1294a7688432b6325794ade32.zip |
disabled flow control for imuxsock
It could cause system hangs under some circumstances.
The devel (3.21.3 and above) will re-enable it and provide
enhanced configurability to overcome the problems if they occur.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | plugins/imuxsock/imuxsock.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -10,6 +10,10 @@ Version 3.18.3 (rgerhards), 2008-08-?? directive is not preserved - if the misspelled directive was used (which I consider highly unlikely), the config file must be changed. Thanks to lperr for reporting the bug. +- disabled flow control for imuxsock, as it could cause system hangs + under some circumstances. The devel (3.21.3 and above) will + re-enable it and provide enhanced configurability to overcome the + problems if they occur. --------------------------------------------------------------------------- Version 3.18.2 (rgerhards), 2008-08-08 - merged in IPv6 forwarding address bugfix from v2-stable diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index f8798039..60ccaffb 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -181,7 +181,7 @@ static rsRetVal readSocket(int fd, int bParseHost, int flags) iRcvd = recv(fd, line, MAXLINE - 1, 0); dbgprintf("Message from UNIX socket: #%d\n", fd); if (iRcvd > 0) { - parseAndSubmitMessage((char*)LocalHostName, line, iRcvd, bParseHost, flags, eFLOWCTL_LIGHT_DELAY); + parseAndSubmitMessage((char*)LocalHostName, line, iRcvd, bParseHost, flags, eFLOWCTL_NO_DELAY); } else if (iRcvd < 0 && errno != EINTR) { char errStr[1024]; rs_strerror_r(errno, errStr, sizeof(errStr)); |