Changeset aabbd97 in nscp for modules

Timestamp:

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

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

70f2d7b

Parents:

f42280d

Message:

Nya settingssysmetet kompilerar

Location:

modules

Files:

• CheckSystem/PDHCollector.cpp (modified) (1 diff)
• NSClientListener/NSClientListener.cpp (modified) (2 diffs)

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);
 
 

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);