diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index cacd17b76..4593b34ba 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -14,9 +14,9 @@ using namespace icinga; std::atomic WorkQueue::m_NextID(1); boost::thread_specific_ptr l_ThreadWorkQueue; -WorkQueue::WorkQueue(size_t maxItems, int threadCount) +WorkQueue::WorkQueue(size_t maxItems, int threadCount, LogSeverity statsLogLevel) : m_ID(m_NextID++), m_ThreadCount(threadCount), m_MaxItems(maxItems), - m_TaskStats(15 * 60) + m_TaskStats(15 * 60), m_StatsLogLevel(statsLogLevel) { /* Initialize logger. */ m_StatusTimerTimeout = Utility::GetTime(); @@ -216,7 +216,7 @@ void WorkQueue::StatusTimerHandler() /* Log if there are pending items, or 5 minute timeout is reached. */ if (pending > 0 || m_StatusTimerTimeout < now) { - Log(LogInformation, "WorkQueue") + Log(m_StatsLogLevel, "WorkQueue") << "#" << m_ID << " (" << m_Name << ") " << "items: " << pending << ", " << "rate: " << std::setw(2) << GetTaskCount(60) / 60.0 << "/s " diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp index bc84d9176..1c3df57b2 100644 --- a/lib/base/workqueue.hpp +++ b/lib/base/workqueue.hpp @@ -6,6 +6,7 @@ #include "base/i2-base.hpp" #include "base/timer.hpp" #include "base/ringbuffer.hpp" +#include "base/logger.hpp" #include #include #include @@ -52,7 +53,7 @@ class WorkQueue public: typedef std::function ExceptionCallback; - WorkQueue(size_t maxItems = 0, int threadCount = 1); + WorkQueue(size_t maxItems = 0, int threadCount = 1, LogSeverity statsLogLevel = LogInformation); ~WorkQueue(); void SetName(const String& name); @@ -129,6 +130,7 @@ private: std::vector m_Exceptions; Timer::Ptr m_StatusTimer; double m_StatusTimerTimeout; + LogSeverity m_StatsLogLevel; RingBuffer m_TaskStats; size_t m_PendingTasks{0};