From 030f3d40121bc7e4c806f6460fe0674ed5fcba99 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Fri, 5 May 2006 19:37:56 +0000 Subject: EnableReporting config parameter not used anymore, orkaudio always tries to report activity. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@225 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/Reporting.cpp | 14 ++++++++++++-- orkaudio/Reporting.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'orkaudio') diff --git a/orkaudio/Reporting.cpp b/orkaudio/Reporting.cpp index 13d9c95..2be599e 100644 --- a/orkaudio/Reporting.cpp +++ b/orkaudio/Reporting.cpp @@ -23,6 +23,11 @@ Reporting Reporting::m_reportingSingleton; +Reporting::Reporting() +{ + m_queueFullError = false; +} + Reporting* Reporting::GetInstance() { return &m_reportingSingleton; @@ -33,10 +38,15 @@ void Reporting::AddAudioTape(AudioTapeRef audioTapeRef) if (m_audioTapeQueue.push(audioTapeRef)) { LOG4CXX_DEBUG(LOG.reportingLog, CStdString("added audiotape to queue:") + audioTapeRef->GetIdentifier()); + m_queueFullError = false; } else { - LOG4CXX_ERROR(LOG.reportingLog, CStdString("Reporting: queue full")); + if(m_queueFullError == false) + { + m_queueFullError = true; + LOG4CXX_ERROR(LOG.reportingLog, CStdString("queue full")); + } } } @@ -63,7 +73,7 @@ void Reporting::ThreadHandler(void *args) MessageRef msgRef; audioTapeRef->GetMessage(msgRef); - if(msgRef.get() && CONFIG.m_enableReporting) + if(msgRef.get() /*&& CONFIG.m_enableReporting*/) { CStdString msgAsSingleLineString = msgRef->SerializeSingleLine(); LOG4CXX_INFO(LOG.reportingLog, msgAsSingleLineString); diff --git a/orkaudio/Reporting.h b/orkaudio/Reporting.h index 0d09333..e2afb72 100644 --- a/orkaudio/Reporting.h +++ b/orkaudio/Reporting.h @@ -20,6 +20,7 @@ class Reporting { public: + Reporting(); static Reporting* GetInstance(); static void ThreadHandler(void *args); @@ -27,6 +28,7 @@ public: private: static Reporting m_reportingSingleton; ThreadSafeQueue m_audioTapeQueue; + bool m_queueFullError; }; #endif -- cgit v1.2.3