diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
| commit | 9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (patch) | |
| tree | c5f10c015dae3fcfcf52e2bc5985d40cb70fa119 /plugins/imfile | |
| parent | b941f68aaeec4bd458328e09121b623ac63f6dd6 (diff) | |
| parent | 9f1e195f3d642de85a92199ef9882b820d3fec21 (diff) | |
| download | rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.gz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.xz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/glbl.c
tools/omdiscard.c
Diffstat (limited to 'plugins/imfile')
| -rw-r--r-- | plugins/imfile/imfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index a9096dca..ea53de05 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -291,13 +291,13 @@ CODESTARTrunInput pthread_cleanup_push(inputModuleCleanup, NULL); while(glbl.GetGlobalInputTermState() == 0) { do { - if(glbl.GetGlobalInputTermState() == 1) - break; /* terminate input! */ bHadFileData = 0; for(i = 0 ; i < iFilPtr ; ++i) { + if(glbl.GetGlobalInputTermState() == 1) + break; /* terminate input! */ pollFile(&files[i], &bHadFileData); } - } while(iFilPtr > 1 && bHadFileData == 1); /* warning: do...while()! */ + } while(iFilPtr > 1 && bHadFileData == 1 && glbl.GetGlobalInputTermState() == 0); /* warning: do...while()! */ /* Note: the additional 10ns wait is vitally important. It guards rsyslog against totally * hogging the CPU if the users selects a polling interval of 0 seconds. It doesn't hurt any |