From: Michael Friedrich Date: Tue, 19 Feb 2019 13:54:28 +0000 (+0100) Subject: Revert "InfluxdbWriter#Stop(): flush buffer" X-Git-Tag: v2.11.0-rc1~212^2~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b2b45b503dd193d5eb3eba41353f33b5515ccab;p=icinga2 Revert "InfluxdbWriter#Stop(): flush buffer" This reverts commit 8470facfe2d8437d5db75e4f84434991d30032c7. --- diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp index 80d050233..91fb1be10 100644 --- a/lib/perfdata/influxdbwriter.cpp +++ b/lib/perfdata/influxdbwriter.cpp @@ -140,14 +140,6 @@ void InfluxdbWriter::Pause() ObjectImpl::Pause(); } -void InfluxdbWriter::Stop(bool runtimeDeleted) -{ - FlushTimeout(); - m_WorkQueue.Join(); - - ObjectImpl::Stop(runtimeDeleted); -} - void InfluxdbWriter::AssertOnWorkQueue() { ASSERT(m_WorkQueue.IsWorkerThread()); diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp index 370ca25c5..face44f69 100644 --- a/lib/perfdata/influxdbwriter.hpp +++ b/lib/perfdata/influxdbwriter.hpp @@ -51,7 +51,6 @@ protected: void OnConfigLoaded() override; void Resume() override; void Pause() override; - void Stop(bool runtimeDeleted) override; private: WorkQueue m_WorkQueue{10000000, 1};