Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Add missing breaks to switch cases in ElasticSearch::HTTPReceive().
This commit is contained in:
Robin Sommer 2012-07-30 09:13:36 -07:00
commit 38c2ee6894
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.0-907 | 2012-07-30 09:13:36 -0700
* Add missing breaks to switch cases in
ElasticSearch::HTTPReceive(). (Jon Siwek)
2.0-905 | 2012-07-28 16:24:34 -0700 2.0-905 | 2012-07-28 16:24:34 -0700
* Fix log manager hanging on waiting for pending file rotations, * Fix log manager hanging on waiting for pending file rotations,

2
VERSION
View file

@ -1 +1 @@
2.0-905 2.0-907

7
src/logging/writers/ElasticSearch.cc
View file

@ -384,12 +384,16 @@ bool ElasticSearch::HTTPSend(CURL *handle)
{ {
if ( ! failing ) if ( ! failing )
Error(Fmt("ElasticSearch server may not be accessible.")); Error(Fmt("ElasticSearch server may not be accessible."));
break;
} }
case CURLE_OPERATION_TIMEDOUT: case CURLE_OPERATION_TIMEDOUT:
{ {
if ( ! failing ) if ( ! failing )
Warning(Fmt("HTTP operation with elasticsearch server timed out at %" PRIu64 " msecs.", transfer_timeout)); Warning(Fmt("HTTP operation with elasticsearch server timed out at %" PRIu64 " msecs.", transfer_timeout));
break;
} }
case CURLE_OK: case CURLE_OK:
@ -401,10 +405,13 @@ bool ElasticSearch::HTTPSend(CURL *handle)
return true; return true;
else if ( ! failing ) else if ( ! failing )
Error(Fmt("Received a non-successful status code back from ElasticSearch server, check the elasticsearch server log.")); Error(Fmt("Received a non-successful status code back from ElasticSearch server, check the elasticsearch server log."));
break;
} }
default: default:
{ {
break;
} }
} }
// The "successful" return happens above // The "successful" return happens above