Changeset 8b89aba in nscp

Timestamp:

03/22/06 06:45:44 (7 years ago)

Author:

Michael Medin <michael@…>

Children:

c8ebdec

Parents:

99bb030

Message:

Nya settingssysmetet kompilerar

Location:

trunk

Files:

• NSC.dist (modified) (1 diff)
• include/INISettings.h (added)
• include/REGSettings.h (added)
• include/Settings.h (modified) (10 diffs)
• include/TSettings.h (added)
• include/config.h (modified) (1 diff)
• modules/CheckSystem/PDHCollector.cpp (modified) (1 diff)
• modules/NSClientListener/NSClientListener.cpp (modified) (2 diffs)

trunk/NSC.dist

@@ -35 +35 @@
 ;  If leave this blank anyone can access the deamon remotly (NSClient still requires a valid password).
 ;allowed_hosts=127.0.0.1
+;
+;# USE THIS FILE
+;  Use the INI file as opposed to the registry if this is 0 the registry will be used instead.
+use_file=1
 
 [log]

trunk/include/Settings.h

@@ -6 +6 @@
 #include <windows.h>
 #include <INISettings.h>
+#include <REGSettings.h>
 #define BUFF_LEN 4096
+
+class SettingsException {
+public:
+  SettingsException(std::string str) {}
+
+};
 
 class SettingsT
@@ -21 +28 @@
   saveSectionList data_;
   bool bHasInternalData;
-  INISettings iniManager;
+  TSettings *settingsManager;
+
 public:
   typedef std::list<std::string> sectionList;
-  SettingsT(void) : bHasInternalData(false)
+  SettingsT(void) : bHasInternalData(false), settingsManager(NULL)
   {
   }
@@ -30 +38 @@
   virtual ~SettingsT(void)
   {
+    if (settingsManager)
+      delete settingsManager;
   }
 
@@ -36 +46 @@
    * @param file A INI-file to use as settings repository
    */
-  void setFile(std::string file) {
-    iniManager.setFile(file);
+  void setFile(std::string file, bool forceini = false) {
+    if (forceini) {
+      if (settingsManager)
+        delete settingsManager;
+      settingsManager = new INISettings(file);
+      return;
+    }
+    if (REGSettings::hasSettings()) {
+      if (settingsManager)
+        delete settingsManager;
+      settingsManager = new REGSettings();
+    } else if (INISettings::hasSettings(file)) {
+      if (settingsManager)
+        delete settingsManager;
+      settingsManager = new INISettings(file);
+    } else {
+      throw SettingsException("No settings method specified, cannot start");
+    }
   }
 
-#define UNLIKELY_VALUE -1234
+#define UNLIKELY_VALUE_1 -1234
+#define UNLIKELY_VALUE_2 -4321
   void read() {
     sectionList sections = getSections();
@@ -46 +73 @@
       sectionList section = getSection(*it);
       for (sectionList::const_iterator it2=section.begin();it2!=section.end();++it2) {
-        int i = getInt((*it), (*it2), UNLIKELY_VALUE);
-        if (i == UNLIKELY_VALUE) {
-          getString((*it), (*it2));
+        int i = getInt((*it), (*it2), UNLIKELY_VALUE_1);
+        if (i == UNLIKELY_VALUE_1) {
+          if (getInt((*it), (*it2), UNLIKELY_VALUE_2)==UNLIKELY_VALUE_2)
+            getString((*it), (*it2));
+        }
+      }
+    }
+  }
+  void write() {
+    if (bHasInternalData) {
+      for (saveSectionList::const_iterator it=data_.begin();it!=data_.end();++it) {
+        for (saveKeyList::const_iterator kit = it->second.begin(); kit != it->second.end(); ++kit) {
+          if (kit->second.type == valueStruct::sType)
+            setString(it->first, kit->first, kit->second.sVal);
+          else
+            setInt(it->first, kit->first, kit->second.iVal);
         }
       }
@@ -55 +95 @@
 
   sectionList getSections(unsigned int bufferLength = BUFF_LEN) {
+    if (!settingsManager)
+      throw SettingsException("No settings manager found have you configured.");
     sectionList ret;
-    ret = iniManager.getSections();
+    ret = settingsManager->getSections();
     if (bHasInternalData) {
       for (saveSectionList::const_iterator kit = data_.begin(); kit != data_.end(); ++kit) {
@@ -73 +115 @@
    */
   sectionList getSection(std::string section, unsigned int bufferLength = BUFF_LEN) {
+    if (!settingsManager)
+      throw SettingsException("No settings manager found have you configured.");
     sectionList ret;
-    ret = iniManager.getSection(section);
+    ret = settingsManager->getSection(section);
     if (bHasInternalData) {
       saveSectionList::const_iterator it = data_.find(section);
@@ -95 +139 @@
    */
   std::string getString(std::string section, std::string key, std::string defaultValue = "") const {
+    if (!settingsManager)
+      throw SettingsException("No settings manager found have you configured.");
     if (bHasInternalData) {
       saveSectionList::const_iterator it = data_.find(section);
@@ -103 +149 @@
             return kit->second.sVal;
           else
-            throw "whoops";
+            return strEx::itos(kit->second.iVal);
         }
       }
     }
-    std::string ret = iniManager.getString(section, key, defaultValue);
+    std::string ret = settingsManager->getString(section, key, defaultValue);
     return ret;
   }
@@ -125 +171 @@
    */
   int getInt(std::string section, std::string key, int defaultValue = 0) {
-    return iniManager.getInt(section, key, defaultValue);
+    if (!settingsManager)
+      throw SettingsException("No settings manager found have you configured.");
+    if (bHasInternalData) {
+      saveSectionList::const_iterator it = data_.find(section);
+      if (it != data_.end()) {
+        saveKeyList::const_iterator kit = it->second.find(key);
+        if (kit != it->second.end()) {
+          if (kit->second.type == valueStruct::sType)
+            return strEx::stoi(kit->second.sVal);
+          else
+            return kit->second.iVal;
+        }
+      }
+    }
+    return settingsManager->getInt(section, key, defaultValue);
   }
   void setInt(std::string section, std::string key, int value) {

trunk/include/config.h

@@ -95 +95 @@
 // Main Settings
 #define MAIN_SECTION_TITLE "Settings"
+#define MAIN_USEFILE "use_file"
+#define MAIN_USEFILE_DEFAULT 0
 #define MAIN_MASTERKEY "master_key" 
 #define MAIN_MASTERKEY_DEFAULT "This is a secret key that you should change"

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -65 +65 @@
     std::string prefix;
     std::string section;
-    settings.setFile(NSCModuleHelper::getBasePath() + "\\counters.defs");
+    settings.setFile(NSCModuleHelper::getBasePath() + "\\counters.defs", true);
 
 

trunk/modules/NSClientListener/NSClientListener.cpp

@@ -33 +33 @@
 }
 std::string getAllowedHosts() {
-  std::string ret = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, MAIN_ALLOWED_HOSTS, "");
+  std::string ret = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, MAIN_ALLOWED_HOSTS, "");
   if (ret.empty())
     ret = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT);
@@ -41 +41 @@
 bool NSClientListener::loadModule() {
   allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
-  unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT);
-  std::string host = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR, NSCLIENT_SETTINGS_BINDADDR_DEFAULT);
-  unsigned int backLog = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE, NRPE_SETTINGS_LISTENQUE_DEFAULT);
+  unsigned short port = NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT);
+  std::string host = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR, NSCLIENT_SETTINGS_BINDADDR_DEFAULT);
+  unsigned int backLog = NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_LISTENQUE, NSCLIENT_SETTINGS_LISTENQUE_DEFAULT);
   try {
     socket.setHandler(this);