diff --git a/CHANGES b/CHANGES index b3fe4ad620..abf4e46ad5 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Fix log manager hanging on waiting for pending file rotations, diff --git a/VERSION b/VERSION index 57c0d2a8a9..5a58b26488 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0-905 +2.0-907 diff --git a/src/logging/writers/ElasticSearch.cc b/src/logging/writers/ElasticSearch.cc index 7a80866bf7..e688686b35 100644 --- a/src/logging/writers/ElasticSearch.cc +++ b/src/logging/writers/ElasticSearch.cc @@ -384,12 +384,16 @@ bool ElasticSearch::HTTPSend(CURL *handle) { if ( ! failing ) Error(Fmt("ElasticSearch server may not be accessible.")); + + break; } case CURLE_OPERATION_TIMEDOUT: { if ( ! failing ) Warning(Fmt("HTTP operation with elasticsearch server timed out at %" PRIu64 " msecs.", transfer_timeout)); + + break; } case CURLE_OK: @@ -401,10 +405,13 @@ bool ElasticSearch::HTTPSend(CURL *handle) return true; else if ( ! failing ) Error(Fmt("Received a non-successful status code back from ElasticSearch server, check the elasticsearch server log.")); + + break; } default: { + break; } } // The "successful" return happens above