diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-21 08:22:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-21 08:22:09 +0100 |
| commit | 2a0fb1f755eff444fb916d2a825b1ac29511bf72 (patch) | |
| tree | f81c882172b0779e4dc0a430678927dfb36e9aa4 /plugins/omhiredis | |
| parent | b5fbc4e1aa6275dd731ae00f0b900d7204a44ff1 (diff) | |
| download | rsyslog-2a0fb1f755eff444fb916d2a825b1ac29511bf72.tar.gz rsyslog-2a0fb1f755eff444fb916d2a825b1ac29511bf72.tar.xz rsyslog-2a0fb1f755eff444fb916d2a825b1ac29511bf72.zip | |
omhiredis: some more cleanup
- C++ comments to C comment style (some compilers need that)
- removed some left-over from the copy template (was even not needed there ;))
Diffstat (limited to 'plugins/omhiredis')
| -rw-r--r-- | plugins/omhiredis/omhiredis.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c index 5577b7eb..1786a63a 100644 --- a/plugins/omhiredis/omhiredis.c +++ b/plugins/omhiredis/omhiredis.c @@ -53,7 +53,6 @@ typedef struct _instanceData { redisContext *conn; uchar *server; int port; - unsigned uLastHiredisErrno; uchar *tplName; } instanceData; @@ -110,7 +109,7 @@ static rsRetVal initHiredis(instanceData *pData, int bSilent) server = (pData->server == NULL) ? "127.0.0.1" : (char*) pData->server; DBGPRINTF("omhiredis: trying connect to '%s' at port %d\n", server, pData->port); - struct timeval timeout = { 1, 500000 }; // 1.5 seconds + struct timeval timeout = { 1, 500000 }; /* 1.5 seconds */ pData->conn = redisConnectWithTimeout(server, pData->port, timeout); if (pData->conn->err) { if(!bSilent) @@ -145,10 +144,6 @@ rsRetVal writeHiredis(uchar *message, instanceData *pData) finalize_it: - if(iRet == RS_RET_OK) { - pData->uLastHiredisErrno = 0; /* reset error for error supression */ - } - RETiRet; } @@ -205,7 +200,7 @@ CODESTARTnewActInst ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); } - // template string 0 is just a regular string + /* template string 0 is just a regular string */ OMSRsetEntry(*ppOMSR, 0,(uchar*)pData->tplName, OMSR_NO_RQD_TPL_OPTS); CODE_STD_FINALIZERnewActInst @@ -216,7 +211,7 @@ ENDnewActInst BEGINparseSelectorAct CODESTARTparseSelectorAct -// tell the engine we only want one template string +/* tell the engine we only want one template string */ CODE_STD_STRING_REQUESTparseSelectorAct(1) if(!strncmp((char*) p, ":omhiredis:", sizeof(":omhiredis:") - 1)) { errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED, |