diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-16 09:50:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-16 09:50:46 +0200 |
| commit | a4344f350151cdb9172897709fa08680ec8587ba (patch) | |
| tree | ac847ae140a62397ad5f8e8938e7fc6b6a8f90e1 /tcpsrv.c | |
| parent | 73f83d963bc8084a3efc186a383493cbcbc7886e (diff) | |
| parent | e005c5569c3e0c7c9a098036b7ec3596c3c722b4 (diff) | |
| download | rsyslog-a4344f350151cdb9172897709fa08680ec8587ba.tar.gz rsyslog-a4344f350151cdb9172897709fa08680ec8587ba.tar.xz rsyslog-a4344f350151cdb9172897709fa08680ec8587ba.zip | |
Merge branch 'master' into newqueue
Conflicts:
ChangeLog
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -565,6 +565,8 @@ Run(tcpsrv_t *pThis) break; /* terminate input! */ for(i = 0 ; i < pThis->iLstnCurr ; ++i) { + if(glbl.GetGlobalInputTermState() == 1) + ABORT_FINALIZE(RS_RET_FORCE_TERM); CHKiRet(nssel.IsReady(pSel, pThis->ppLstn[i], NSDSEL_RD, &bIsReady, &nfds)); if(bIsReady) { DBGPRINTF("New connect on NSD %p.\n", pThis->ppLstn[i]); @@ -576,6 +578,8 @@ Run(tcpsrv_t *pThis) /* now check the sessions */ iTCPSess = TCPSessGetNxtSess(pThis, -1); while(nfds && iTCPSess != -1) { + if(glbl.GetGlobalInputTermState() == 1) + ABORT_FINALIZE(RS_RET_FORCE_TERM); CHKiRet(nssel.IsReady(pSel, pThis->pSessions[iTCPSess]->pStrm, NSDSEL_RD, &bIsReady, &nfds)); if(bIsReady) { doReceive(pThis, &pThis->pSessions[iTCPSess]); |