From b119c3285bd0784b29c1d265d9ba60b3c315e2da Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 29 Apr 2014 11:01:28 +0200 Subject: [PATCH] Change log level for some messages. Fixes #6072 --- components/checker/checkercomponent.cpp | 4 +--- components/compat/statusdatawriter.cpp | 5 ++--- lib/base/process.cpp | 4 ++-- lib/base/threadpool.cpp | 2 +- lib/base/utility.cpp | 8 ++++++++ lib/base/workqueue.cpp | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp index b086886fb..a050ecc13 100644 --- a/components/checker/checkercomponent.cpp +++ b/components/checker/checkercomponent.cpp @@ -239,8 +239,6 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable) void CheckerComponent::ResultTimerHandler(void) { - Log(LogDebug, "checker", "ResultTimerHandler entered."); - std::ostringstream msgbuf; { @@ -249,7 +247,7 @@ void CheckerComponent::ResultTimerHandler(void) msgbuf << "Pending checkables: " << m_PendingCheckables.size() << "; Idle checkables: " << m_IdleCheckables.size() << "; Checks/s: " << CIB::GetActiveChecksStatistics(5) / 5.0; } - Log(LogInformation, "checker", msgbuf.str()); + Log(LogDebug, "checker", msgbuf.str()); } void CheckerComponent::ObjectHandler(const DynamicObject::Ptr& object) diff --git a/components/compat/statusdatawriter.cpp b/components/compat/statusdatawriter.cpp index ea9fe5515..8ae61a462 100644 --- a/components/compat/statusdatawriter.cpp +++ b/components/compat/statusdatawriter.cpp @@ -747,7 +747,7 @@ void StatusDataWriter::UpdateObjectsCache(void) */ void StatusDataWriter::StatusTimerHandler(void) { - Log(LogInformation, "compat", "Writing status.dat file"); + double start = Utility::GetTime(); String statuspath = GetStatusPath(); String statuspathtmp = statuspath + ".tmp"; /* XXX make this a global definition */ @@ -818,6 +818,5 @@ void StatusDataWriter::StatusTimerHandler(void) << boost::errinfo_file_name(statuspathtmp)); } - Log(LogInformation, "compat", "Finished writing status.dat file"); + Log(LogInformation, "compat", "Writing status.dat file took " + Utility::FormatDuration(Utility::GetTime() - start)); } - diff --git a/lib/base/process.cpp b/lib/base/process.cpp index e17227f4a..6cc886c62 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -378,7 +378,7 @@ void Process::Run(const boost::function& callback) m_Process = pi.hProcess; m_FD = outReadPipe; - Log(LogDebug, "base", "Running command '" + m_Arguments + + Log(LogInformation, "base", "Running command '" + m_Arguments + "': PID " + Convert::ToString(pi.dwProcessId)); #else /* _WIN32 */ @@ -476,7 +476,7 @@ void Process::Run(const boost::function& callback) // parent process - Log(LogDebug, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") + + Log(LogInformation, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") + "': PID " + Convert::ToString(m_Process)); m_Arguments.clear(); diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index 6aa341938..452f1a7b0 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -323,7 +323,7 @@ void ThreadPool::ManagerThreadProc(void) << (long)(total_avg_latency * 1000 / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "ms" << "; Threads: " << total_alive << "; Pool utilization: " << (total_utilization / (sizeof(m_Queues) / sizeof(m_Queues[0]))) << "%"; - Log(LogInformation, "base", msgbuf.str()); + Log(LogDebug, "base", msgbuf.str()); } } } diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index 56559fea2..71ae2d7a0 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -743,6 +743,14 @@ String Utility::FormatDuration(int duration) tokens.push_back(Convert::ToString(seconds) + (seconds != 1 ? " seconds" : " second")); } + if (tokens.size() == 0) { + int milliseconds = floor(duration * 1000); + if (milliseconds >= 1) + tokens.push_back(Convert::ToString(milliseconds) + (milliseconds != 1 ? " milliseconds" : " millisecond")); + else + tokens.push_back("less than 1 millisecond"); + } + return NaturalJoin(tokens); } diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 503285e66..0f26fd1cb 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -123,7 +123,7 @@ void WorkQueue::StatusTimerHandler(void) { boost::mutex::scoped_lock lock(m_Mutex); - Log(LogInformation, "base", "WQ #" + Convert::ToString(m_ID) + " items: " + Convert::ToString(m_Items.size())); + Log(LogDebug, "base", "WQ #" + Convert::ToString(m_ID) + " items: " + Convert::ToString(m_Items.size())); } void WorkQueue::WorkerThreadProc(void)