|
 |
92fbf8 |
From c1cae8d67c58d723bff0d6c47b9991d24289e209 Mon Sep 17 00:00:00 2001
|
|
|
92fbf8 |
From: Tomas Heinrich <theinric@redhat.com>
|
|
|
92fbf8 |
Date: Sun, 12 Jan 2014 22:10:00 +0100
|
|
|
92fbf8 |
Subject: [PATCH] bugfix: omelasticsearch did not compile on platforms without
|
|
|
92fbf8 |
atomic instructions
|
|
|
92fbf8 |
|
|
|
92fbf8 |
Adapted from from http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=16207e3d55ac6bb15af6d50791d2c7462816de57
|
|
|
92fbf8 |
---
|
|
|
92fbf8 |
plugins/omelasticsearch/omelasticsearch.c | 10 +++++-----
|
|
|
92fbf8 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
92fbf8 |
|
|
|
92fbf8 |
diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c
|
|
|
92fbf8 |
index b82968d..cc3c203 100644
|
|
|
92fbf8 |
--- a/plugins/omelasticsearch/omelasticsearch.c
|
|
|
92fbf8 |
+++ b/plugins/omelasticsearch/omelasticsearch.c
|
|
|
92fbf8 |
@@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *message, int msglen, uchar **tpls, int nmsg
|
|
|
92fbf8 |
case CURLE_COULDNT_RESOLVE_PROXY:
|
|
|
92fbf8 |
case CURLE_COULDNT_CONNECT:
|
|
|
92fbf8 |
case CURLE_WRITE_ERROR:
|
|
|
92fbf8 |
- STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail);
|
|
|
92fbf8 |
+ STATSCOUNTER_INC(indexHTTPReqFail, mutIndexHTTPReqFail);
|
|
|
92fbf8 |
indexHTTPFail += nmsgs;
|
|
|
92fbf8 |
DBGPRINTF("omelasticsearch: we are suspending ourselfs due "
|
|
|
92fbf8 |
"to failure %lld of curl_easy_perform()\n",
|
|
|
92fbf8 |
@@ -1001,16 +1001,16 @@ CODEmodInit_QueryRegCFSLineHdlr
|
|
|
92fbf8 |
/* support statistics gathering */
|
|
|
92fbf8 |
CHKiRet(statsobj.Construct(&indexStats));
|
|
|
92fbf8 |
CHKiRet(statsobj.SetName(indexStats, (uchar *)"omelasticsearch"));
|
|
|
92fbf8 |
- STATSCOUNTER_INIT(indexSubmit, mutCtrIndexSubmit);
|
|
|
92fbf8 |
+ STATSCOUNTER_INIT(indexSubmit, mutIndexSubmit);
|
|
|
92fbf8 |
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"submitted",
|
|
|
92fbf8 |
ctrType_IntCtr, &indexSubmit));
|
|
|
92fbf8 |
- STATSCOUNTER_INIT(indexHTTPFail, mutCtrIndexHTTPFail);
|
|
|
92fbf8 |
+ STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail);
|
|
|
92fbf8 |
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http",
|
|
|
92fbf8 |
ctrType_IntCtr, &indexHTTPFail));
|
|
|
92fbf8 |
- STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail);
|
|
|
92fbf8 |
+ STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail);
|
|
|
92fbf8 |
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests",
|
|
|
92fbf8 |
ctrType_IntCtr, &indexHTTPReqFail));
|
|
|
92fbf8 |
- STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail);
|
|
|
92fbf8 |
+ STATSCOUNTER_INIT(indexESFail, mutIndexESFail);
|
|
|
92fbf8 |
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es",
|
|
|
92fbf8 |
ctrType_IntCtr, &indexESFail));
|
|
|
92fbf8 |
CHKiRet(statsobj.ConstructFinalize(indexStats));
|
|
|
92fbf8 |
--
|
|
|
92fbf8 |
1.8.4.3
|
|
|
92fbf8 |
|