tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

InfluxdbWriter: don't leak sockets
This commit is contained in:
Michael Friedrich 2019-03-18 14:38:04 +01:00 committed by GitHub
parent 66246bdb86 2a6b122413
commit 2de8bac588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/defer.hpp
View File

@ -30,7 +30,11 @@ public:
inline
~Defer()
{
m_Func();
try {
m_Func();
} catch (...) {
// https://stackoverflow.com/questions/130117/throwing-exceptions-out-of-a-destructor
}
}
private:

3
lib/perfdata/influxdbwriter.cpp
View File

@ -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());