diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 13:31:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 13:31:02 +0100 |
| commit | 3fb01ebcc0da98fee5fa5f854fad5d347d3f5649 (patch) | |
| tree | d54e1c433db2f0c6d45e7f5dbf91a10daff514ff /plugins/imdiag/imdiag.c | |
| parent | 4e3589857a2b2667d4b9ad92fe152acb85283aca (diff) | |
| parent | 41211495e5234c1ed4ccd408a4043915ad075771 (diff) | |
| download | rsyslog-3fb01ebcc0da98fee5fa5f854fad5d347d3f5649.tar.gz rsyslog-3fb01ebcc0da98fee5fa5f854fad5d347d3f5649.tar.bz2 rsyslog-3fb01ebcc0da98fee5fa5f854fad5d347d3f5649.zip | |
Merge branch 'nspoll'
Diffstat (limited to 'plugins/imdiag/imdiag.c')
| -rw-r--r-- | plugins/imdiag/imdiag.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index 2f7e5fee..81b357ef 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -270,6 +270,11 @@ waitMainQEmpty(tcps_sess_t *pSess) dbgprintf("imdiag sleeping, wait mainq drain, curr size %d\n", iMsgQueueSize); srSleep(0,2); /* wait a little bit */ CHKiRet(diagGetMainMsgQSize(&iMsgQueueSize)); + if(iMsgQueueSize == 0) { + /* verify that queue is still empty (else it could just be a race!) */ + srSleep(1,5); /* wait a little bit */ + CHKiRet(diagGetMainMsgQSize(&iMsgQueueSize)); + } } CHKiRet(sendResponse(pSess, "mainqueue empty\n")); |