Fix connection error handling in Elasticsearch and InfluxDB features

Previously this would just throw the entire exception stack trace
which is not needed here.

fixes #6394

diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
index 2e8ffa5159e4879f8d2ebe9387cad7e112e291df..d9d56b00472a6d22761064a98d0ae2bf31a3b697 100644 (file)
--- a/lib/perfdata/elasticsearchwriter.cpp
+++ b/lib/perfdata/elasticsearchwriter.cpp
@@ -428,7 +428,19 @@ void ElasticsearchWriter::SendRequest(const String& body)
 
        url->SetPath(path);
 
-       Stream::Ptr stream = Connect();
+       Stream::Ptr stream;
+
+       try {
+               stream = Connect();
+       } catch (const std::exception& ex) {
+               Log(LogWarning, "ElasticsearchWriter")
+                       << "Flush failed, cannot connect to Elasticsearch.";
+               return;
+       }
+
+       if (!stream)
+               return;
+
        HttpRequest req(stream);
 
        /* Specify required headers by Elasticsearch. */

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index 8a3fe97b19366a949b593f0e80afd48a73763075..89cf13220db1222cfe6778141ea140f4436956ad 100644 (file)
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/lib/perfdata/influxdbwriter.cpp
@@ -419,7 +419,15 @@ void InfluxdbWriter::Flush()
        String body = boost::algorithm::join(m_DataBuffer, "\n");
        m_DataBuffer.clear();
 
-       Stream::Ptr stream = Connect();
+       Stream::Ptr stream;
+
+       try {
+               stream = Connect();
+       } catch (const std::exception& ex) {
+               Log(LogWarning, "InfluxDbWriter")
+                       << "Flush failed, cannot connect to InfluxDB.";
+               return;
+       }
 
        if (!stream)
                return;