diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 07:11:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 07:11:44 +0200 |
| commit | 16207e3d55ac6bb15af6d50791d2c7462816de57 (patch) | |
| tree | e9b7c880c8efb68430c8c5009941d190be155393 | |
| parent | fea7c46f2c42b4b5691137d09b32b60e91fc6f42 (diff) | |
| download | rsyslog-16207e3d55ac6bb15af6d50791d2c7462816de57.tar.gz rsyslog-16207e3d55ac6bb15af6d50791d2c7462816de57.tar.bz2 rsyslog-16207e3d55ac6bb15af6d50791d2c7462816de57.zip | |
bugfix: omelasticsearch did not compile on platforms without atomic instructions
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -1,6 +1,8 @@ --------------------------------------------------------------------------- Version 7.5.6 [devel] 2013-10-?? - bugfix: segfault if re_extract() function was used and no match found +- bugfix: omelasticsearch did not compile on platforms without atomic + instructions --------------------------------------------------------------------------- Version 7.5.5 [devel] 2013-10-16 - imfile: permit to monitor an unlimited number of files diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 7a48066c..eb82c35f 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *message, int msglen, uchar **tpls, int nmsg case CURLE_COULDNT_RESOLVE_PROXY: case CURLE_COULDNT_CONNECT: case CURLE_WRITE_ERROR: - STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail); + STATSCOUNTER_INC(indexHTTPReqFail, mutIndexHTTPReqFail); indexHTTPFail += nmsgs; DBGPRINTF("omelasticsearch: we are suspending ourselfs due " "to failure %lld of curl_easy_perform()\n", @@ -1001,16 +1001,16 @@ CODEmodInit_QueryRegCFSLineHdlr /* support statistics gathering */ CHKiRet(statsobj.Construct(&indexStats)); CHKiRet(statsobj.SetName(indexStats, (uchar *)"omelasticsearch")); - STATSCOUNTER_INIT(indexSubmit, mutCtrIndexSubmit); + STATSCOUNTER_INIT(indexSubmit, mutIndexSubmit); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"submitted", ctrType_IntCtr, CTR_FLAG_RESETTABLE, &indexSubmit)); - STATSCOUNTER_INIT(indexHTTPFail, mutCtrIndexHTTPFail); + STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http", ctrType_IntCtr, CTR_FLAG_RESETTABLE, &indexHTTPFail)); - STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail); + STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests", ctrType_IntCtr, CTR_FLAG_RESETTABLE, &indexHTTPReqFail)); - STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail); + STATSCOUNTER_INIT(indexESFail, mutIndexESFail); CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es", ctrType_IntCtr, CTR_FLAG_RESETTABLE, &indexESFail)); CHKiRet(statsobj.ConstructFinalize(indexStats)); |