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 /runtime/nsd_ptcp.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 'runtime/nsd_ptcp.c')
| -rw-r--r-- | runtime/nsd_ptcp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c index fe31ab40..96881097 100644 --- a/runtime/nsd_ptcp.c +++ b/runtime/nsd_ptcp.c @@ -562,6 +562,7 @@ finalize_it: static rsRetVal Rcv(nsd_t *pNsd, uchar *pRcvBuf, ssize_t *pLenBuf) { + char errStr[1024]; DEFiRet; nsd_ptcp_t *pThis = (nsd_ptcp_t*) pNsd; ISOBJ_TYPE_assert(pThis, nsd_ptcp); @@ -571,7 +572,9 @@ Rcv(nsd_t *pNsd, uchar *pRcvBuf, ssize_t *pLenBuf) if(*pLenBuf == 0) { ABORT_FINALIZE(RS_RET_CLOSED); } else if (*pLenBuf < 0) { - ABORT_FINALIZE(RS_RET_ERR); + rs_strerror_r(errno, errStr, sizeof(errStr)); + dbgprintf("error during recv on NSD %p: %s\n", pNsd, errStr); + ABORT_FINALIZE(RS_RET_RCV_ERR); } finalize_it: @@ -821,6 +824,7 @@ ENDObjClassInit(nsd_ptcp) BEGINmodExit CODESTARTmodExit + nsdpoll_ptcpClassExit(); nsdsel_ptcpClassExit(); nsd_ptcpClassExit(); ENDmodExit @@ -839,6 +843,7 @@ CODESTARTmodInit /* Initialize all classes that are in our module - this includes ourselfs */ CHKiRet(nsd_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ CHKiRet(nsdsel_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ + CHKiRet(nsdpoll_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ ENDmodInit /* vi:set ai: */ |