diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 18:03:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 18:03:23 +0200 |
| commit | 2fcd6ea84b21a46d6b01e5ccaf2965a5c32566d5 (patch) | |
| tree | 4060d21aa6e253d1be2832f85b613323de21f208 | |
| parent | 8d039081cf28d38e63ad7659253038b6bbc477e3 (diff) | |
| parent | a4cdd70e711dc920ac5278474a470770826fc75c (diff) | |
| download | rsyslog-2fcd6ea84b21a46d6b01e5ccaf2965a5c32566d5.tar.gz rsyslog-2fcd6ea84b21a46d6b01e5ccaf2965a5c32566d5.tar.bz2 rsyslog-2fcd6ea84b21a46d6b01e5ccaf2965a5c32566d5.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -167,6 +167,7 @@ Version 7.4.5 [v7.4-stable] 2013-09-?? - omelasticsearch: add failed.httprequests stats counter - bugfix: omelasticsearch: correct failed.http stats counter - bugfix: omelasticsearch: did not correctly initialize stats counters +- bugfix: omelasticsearch: failed.es counter was only maintained in bulk mode This usually did not lead to any problems, because they are in static memory, which is initialized to zero by the OS when the plugin is loaded. But it may cause problems especially on systems that do not diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 7fa06d0f..7a48066c 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -542,9 +542,6 @@ DBGPRINTF("omelasticsearch: %d items in reply\n", numitems); } finalize_it: - if(iRet != RS_RET_OK) { - STATSCOUNTER_INC(indexESFail, mutIndexESFail); - } RETiRet; } @@ -582,6 +579,9 @@ checkResult(instanceData *pData, uchar *reqmsg) finalize_it: if(root != NULL) cJSON_Delete(root); + if(iRet != RS_RET_OK) { + STATSCOUNTER_INC(indexESFail, mutIndexESFail); + } RETiRet; } |