listener-observer implementation for config changes

logger listens to minseverity updates
rhomobile · Dec 24, 2017 · 99f650e · 99f650e
1 parent bbf72b2
commit 99f650e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/platform/shared/common/RhoConf.cpp b/platform/shared/common/RhoConf.cpp
@@ -235,13 +235,16 @@ bool   RhoSettings::getBool(const char* szName){
 
 void   RhoSettings::setString(const char* szName, const String& str, boolean bSaveToFile){
     m_mapValues[szName] = str;
+    notifyListeners( szName, str );
 
     if ( bSaveToFile )
         saveToFile(szName);
 }
 
 void   RhoSettings::setInt(const char* szName, int nVal, boolean bSaveToFile){
-    m_mapValues[szName] = common::convertToStringA(nVal);
+    const String sVal = common::convertToStringA(nVal);
+    m_mapValues[szName] = sVal;
+    notifyListeners( szName, sVal );
 
     if ( bSaveToFile )
         saveToFile(szName);
@@ -263,6 +266,14 @@ void  RhoSettings::removeProperty(const char* szName, boolean bSaveToFile)
         saveToFile( szName, true );
 }
 
+void RhoSettings::notifyListeners( const String& name, const String& newVal )
+{
+    for ( int i = 0; i < m_listeners.size(); ++i )
+    {
+        m_listeners[i]->onSettingUpdated( name, newVal );
+    }
+}
+
 }
 }
 

diff --git a/platform/shared/common/RhoConf.h b/platform/shared/common/RhoConf.h
@@ -37,7 +37,15 @@ namespace common{
 #define RHOVERSION "Version"
 #define RHODBVERSION "DBVersion"
 
+class IRhoSettingsListener {
+public:
+    virtual void onSettingUpdated( const String& name, const String& newVal ) = 0;
+};
+
 class RhoSettings{
+
+    Vector<IRhoSettingsListener*> m_listeners;
+
     String      m_strConfFilePath, m_strAppConfFilePath, m_strAppConfUserPath;
     Hashtable<String,String> m_mapValues;
     Hashtable<String,String> m_mapChangedValues;
@@ -70,6 +78,10 @@ class RhoSettings{
 
     HashtablePtr<String,Vector<String>* >& getConflicts(){ return m_mapConflictedValues;}
     void conflictsResolved();
+
+    void addListener( IRhoSettingsListener* l ) { m_listeners.push_back(l); }
+    void removeListener( IRhoSettingsListener* l ) { m_listeners.removeElement(l); }
+
 protected:
     void saveChangesToString(String& strData);
     void loadFromString(const char* szSettings, Hashtable<String,String>& mapValues);
@@ -80,6 +92,9 @@ class RhoSettings{
     void saveToFile(const char* szName, boolean bRemove = false );
     void readChanges();
     void checkConflicts();
+
+private:    
+    void notifyListeners( const String& name, const String& newVal );
 };
 
 extern RhoSettings g_RhoSettings;

diff --git a/platform/shared/logging/RhoLogConf.cpp b/platform/shared/logging/RhoLogConf.cpp
@@ -312,6 +312,9 @@ void LogSettings::loadFromConf(rho::common::RhoSettings& oRhoConf)
 		int milliseconds = oRhoConf.getInt("LogMemPeriod");
 		setCollectMemoryInfoInterval(milliseconds);
 	}
+
+    oRhoConf.addListener( this );
+
     m_bIsInitialized = true;
 }
 
@@ -387,6 +390,12 @@ void LogSettings::internalSinkLogMessage( String& strMsg ){
     }
 }
 
+void LogSettings::onSettingUpdated( const String& name, const String& newVal ) {
+    if ( strcasecmp(name.c_str(),"minseverity") == 0 ) {
+        setMinSeverity( atoi(newVal.c_str()) );
+    }
+}
+
 bool LogSettings::isCategoryEnabled(const LogCategory& cat)const{
     //TODO: Optimize categories search : add map
     common::CMutexLock oLock(m_CatLock);

diff --git a/platform/shared/logging/RhoLogConf.h b/platform/shared/logging/RhoLogConf.h
@@ -34,10 +34,10 @@
 #include "common/RhoMutexLock.h"
 #include "common/RhoTime.h"
 #include "common/RhoThread.h"
+#include "common/RhoConf.h"
 
 namespace rho {
 
-namespace common{ class RhoSettings; }
 class LogCategory;
 
 struct ILogSink{
@@ -54,7 +54,7 @@ class IMemoryInfoCollector
     virtual String collect() = 0;
 };
 
-class LogSettings{
+class LogSettings : public common::IRhoSettingsListener {
 
     class MemoryInfoCollectorThread : public common::CRhoThread
     {
@@ -183,6 +183,8 @@ class LogSettings{
 
 private:
 	void internalSinkLogMessage( String& strMsg );
+    virtual void onSettingUpdated( const String& name, const String& newVal );
+
 };
 
 extern LogSettings g_LogSettings;