Merge pull request #6990 from Icinga/bugfix/influxdbwriter-oom-6989

InfluxdbWriter: don't leak sockets
Icinga · Mar 18, 2019 · 2de8bac · 2de8bac
2 parents 66246bd + 2a6b122
commit 2de8bac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/base/defer.hpp b/lib/base/defer.hpp
@@ -30,7 +30,11 @@ class Defer
 	inline
 	~Defer()
 	{
-		m_Func();
+		try {
+			m_Func();
+		} catch (...) {
+			// https://stackoverflow.com/questions/130117/throwing-exceptions-out-of-a-destructor
+		}
 	}
 
 private:

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
@@ -9,6 +9,7 @@
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/checkcommand.hpp"
+#include "base/defer.hpp"
 #include "base/tcpsocket.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
@@ -447,6 +448,8 @@ void InfluxdbWriter::Flush()
 	if (!stream)
 		return;
 
+	Defer close ([&stream]() { stream->Close(); });
+
 	Url::Ptr url = new Url();
 	url->SetScheme(GetSslEnable() ? "https" : "http");
 	url->SetHost(GetHost());