From e9c475d45f7fbe78d68e8d0cafe66b829acb6ce6 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sat, 2 Dec 2017 20:24:30 +0100
Subject: Shared/Metric: Stop metrics on shutdown

Properly stop metric information gathering and sending on shutdown.
Issue reported by AddressSanitizer.
---
 src/common/Metric/Metric.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp
index 10f0d13b688..e208cdc4aec 100644
--- a/src/common/Metric/Metric.cpp
+++ b/src/common/Metric/Metric.cpp
@@ -217,7 +217,12 @@ void Metric::ForceSend()
 {
     // Send what's queued only if io_service is stopped (so only on shutdown)
     if (_enabled && _batchTimer->get_io_service().stopped())
+    {
+        _enabled = false;
         SendBatch();
+        _batchTimer->cancel();
+        _overallStatusTimer->cancel();
+    }
 }
 
 void Metric::ScheduleOverallStatusLog()
-- 
cgit v1.2.3