mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-19 09:10:42 +01:00
Merge pull request #4971 from rgerhards/imtcp-cleanup
tcpsrv: cleanup - remove commented out code
This commit is contained in:
commit
5554170a09
@ -604,7 +604,6 @@ doReceive(tcpsrv_t *pThis, tcps_sess_t **ppSess, nspoll_t *pPoll)
|
|||||||
case RS_RET_CLOSED:
|
case RS_RET_CLOSED:
|
||||||
if(pThis->bEmitMsgOnClose) {
|
if(pThis->bEmitMsgOnClose) {
|
||||||
errno = 0;
|
errno = 0;
|
||||||
// prop.GetString((*ppSess)->fromHostIP, &pszPeer, &lenPeer);
|
|
||||||
LogError(0, RS_RET_PEER_CLOSED_CONN, "Netstream session %p closed by remote "
|
LogError(0, RS_RET_PEER_CLOSED_CONN, "Netstream session %p closed by remote "
|
||||||
"peer %s.\n", (*ppSess)->pStrm, pszPeer);
|
"peer %s.\n", (*ppSess)->pStrm, pszPeer);
|
||||||
}
|
}
|
||||||
@ -620,13 +619,11 @@ doReceive(tcpsrv_t *pThis, tcps_sess_t **ppSess, nspoll_t *pPoll)
|
|||||||
/* in this case, something went awfully wrong.
|
/* in this case, something went awfully wrong.
|
||||||
* We are instructed to terminate the session.
|
* We are instructed to terminate the session.
|
||||||
*/
|
*/
|
||||||
// prop.GetString((*ppSess)->fromHostIP, &pszPeer, &lenPeer);
|
|
||||||
LogError(oserr, localRet, "Tearing down TCP Session from %s", pszPeer);
|
LogError(oserr, localRet, "Tearing down TCP Session from %s", pszPeer);
|
||||||
CHKiRet(closeSess(pThis, ppSess, pPoll));
|
CHKiRet(closeSess(pThis, ppSess, pPoll));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// prop.GetString((*ppSess)->fromHostIP, &pszPeer, &lenPeer);
|
|
||||||
LogError(oserr, iRet, "netstream session %p from %s will be closed due to error",
|
LogError(oserr, iRet, "netstream session %p from %s will be closed due to error",
|
||||||
(*ppSess)->pStrm, pszPeer);
|
(*ppSess)->pStrm, pszPeer);
|
||||||
CHKiRet(closeSess(pThis, ppSess, pPoll));
|
CHKiRet(closeSess(pThis, ppSess, pPoll));
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user