diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
| commit | c561994c108627c490729d98d671c45b4f9684e5 (patch) | |
| tree | a6b29ced552cba8c402af0d7401fb7ee5c569110 /runtime | |
| parent | f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06 (diff) | |
| parent | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff) | |
| download | rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.gz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.xz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
tcpsrv.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/nsd_ptcp.c | 6 | ||||
| -rw-r--r-- | runtime/nsdsel_gtls.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c index c8915231..69eb7684 100644 --- a/runtime/nsd_ptcp.c +++ b/runtime/nsd_ptcp.c @@ -334,6 +334,12 @@ AcceptConnReq(nsd_t *pNsd, nsd_t **ppNew) iNewSock = accept(pThis->sock, (struct sockaddr*) &addr, &addrlen); if(iNewSock < 0) { + if(Debug) { + char errStr[1024]; + rs_strerror_r(errno, errStr, sizeof(errStr)); + dbgprintf("nds_ptcp: error accepting connection on socket %d, errno %d: %s\n", + pThis->sock, errno, errStr); + } ABORT_FINALIZE(RS_RET_ACCEPT_ERR); } diff --git a/runtime/nsdsel_gtls.c b/runtime/nsdsel_gtls.c index 1a389a00..aff55af2 100644 --- a/runtime/nsdsel_gtls.c +++ b/runtime/nsdsel_gtls.c @@ -177,6 +177,7 @@ doRetry(nsd_gtls_t *pNsd) finalize_it: if(iRet != RS_RET_OK && iRet != RS_RET_CLOSED && iRet != RS_RET_RETRY) pNsd->bAbortConn = 1; /* request abort */ +dbgprintf("XXXXXX: doRetry: iRet %d, pNsd->bAbortConn %d\n", iRet, pNsd->bAbortConn); RETiRet; } |