diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
| commit | 3ab1e5b943d297ed0b23a8988f354fed3fec9fdf (patch) | |
| tree | 4e4e29a0911eebb7e2842e3ec5a6d9a5686720ae /tools | |
| parent | 200e08ac4252a0a0eca31a441e63688179baebb1 (diff) | |
| parent | bb6f5dc40f39220a2cdb05e94d70aac42d971ac4 (diff) | |
| download | rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.gz rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.xz rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
runtime/rsconf.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfwd.c | 11 | ||||
| -rw-r--r-- | tools/omusrmsg.c | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index 155e00d1..2fd24bdf 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -436,7 +436,7 @@ TCPSendBuf(instanceData *pData, uchar *buf, unsigned len) ssize_t lenSend; alreadySent = 0; - netstrm.CheckConnection(pData->pNetstrm); /* hack for plain tcp syslog - see ptcp driver for details */ + CHKiRet(netstrm.CheckConnection(pData->pNetstrm)); /* hack for plain tcp syslog - see ptcp driver for details */ while(alreadySent != len) { lenSend = len - alreadySent; CHKiRet(netstrm.Send(pData->pNetstrm, buf+alreadySent, &lenSend)); @@ -445,6 +445,12 @@ TCPSendBuf(instanceData *pData, uchar *buf, unsigned len) } finalize_it: + if(iRet != RS_RET_OK) { + /* error! */ + dbgprintf("TCPSendBuf error %d, destruct TCP Connection!\n", iRet); + DestructTCPInstanceData(pData); + iRet = RS_RET_SUSPENDED; + } RETiRet; } @@ -489,6 +495,7 @@ static rsRetVal TCPSendPrepRetry(void *pvData) { DEFiRet; instanceData *pData = (instanceData *) pvData; +dbgprintf("TCPSendPrepRetry performs a DestructTCPInstanceData\n"); assert(pData != NULL); DestructTCPInstanceData(pData); @@ -506,6 +513,7 @@ static rsRetVal TCPSendInit(void *pvData) assert(pData != NULL); if(pData->pNetstrm == NULL) { + dbgprintf("TCPSendInit CREATE\n"); CHKiRet(netstrms.Construct(&pData->pNS)); /* the stream driver must be set before the object is finalized! */ CHKiRet(netstrms.SetDrvrName(pData->pNS, pData->pszStrmDrvr)); @@ -529,6 +537,7 @@ static rsRetVal TCPSendInit(void *pvData) finalize_it: if(iRet != RS_RET_OK) { + dbgprintf("TCPSendInit FAILED with %d.\n", iRet); DestructTCPInstanceData(pData); } diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e57d7ef9..a7df9243 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -385,6 +385,7 @@ BEGINparseSelectorAct int bHadWarning; CODESTARTparseSelectorAct CODE_STD_STRING_REQUESTparseSelectorAct(1) + bHadWarning = 0; if(!strncmp((char*) p, ":omusrmsg:", sizeof(":omusrmsg:") - 1)) { p += sizeof(":omusrmsg:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ } else { |