Changeset e26cfe0 in nscp for NSClient++.cpp

Timestamp:

07/11/05 21:55:28 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

75d5e70

Parents:

6654022

Message:

changes all over manily in the checking code

File:

• NSClient++.cpp (modified) (13 diffs)

NSClient++.cpp

@@ -20 +20 @@
 #include <Socket.h>
 #include <b64/b64.h>
-
+#include <PDHCounter.h>
 
 NSClient mainClient;  // Global core instance.
@@ -82 +82 @@
       g_bConsoleLog = true;
       LOG_MESSAGE(SZAPPNAME " Version: " SZVERSION);
+
+
+    } else if ( _stricmp( "listpdh", argv[1]+1 ) == 0 ) {
+      PDH::Enumerations::str_lst lst = PDH::Enumerations::EnumObjects();
+      for (PDH::Enumerations::str_lst::iterator it = lst.begin();it!=lst.end();++it) {
+        PDH::Enumerations::str_lst lst = PDH::Enumerations::EnumObjectItems(*it);
+        for (PDH::Enumerations::str_lst::iterator it2 = lst.begin();it2!=lst.end();++it2) {
+          std::cout << "\\" << *it <<"\\" << *it2 << std::endl;;
+        }
+      }
     } else if ( _stricmp( "test", argv[1]+1 ) == 0 ) {
 #ifdef _DEBUG
@@ -96 +106 @@
       LOG_MESSAGE("Enter command to inject or exit to terminate...");
       std::string s = "";
+      std::string buff = "";
       std::cin >> s;
       while (s != "exit") {
-        strEx::token t = strEx::getToken(s, ',');
-        std::string msg, perf;
-        NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ',', msg, perf);
-        if (perf.empty())
-          std::cout << NSCHelper::translateReturn(ret) << ":" << msg << std::endl;
-        else
-          std::cout << NSCHelper::translateReturn(ret) << ":" << msg << "|" << perf << std::endl;
+        if (std::cin.peek() < 15) {
+          buff += s;
+          strEx::token t = strEx::getToken(buff, ' ');
+          std::string msg, perf;
+          NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ' ', msg, perf);
+          if (perf.empty())
+            std::cout << NSCHelper::translateReturn(ret) << ":" << msg << std::endl;
+          else
+            std::cout << NSCHelper::translateReturn(ret) << ":" << msg << "|" << perf << std::endl;
+          buff = "";
+        } else {
+          buff += s + " ";
+        }
         std::cin >> s;
       }
@@ -137 +154 @@
   for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
     try {
-      LOG_DEBUG_STD("Loading: " + getBasePath() + "modules\\" + (*it));
       loadPlugin(getBasePath() + "modules\\" + (*it));
     } catch(const NSPluginException& e) {
@@ -143 +159 @@
     }
   }
+  loadPlugins();
 }
 /**
@@ -186 +203 @@
  * @param plugins A list with plug-ins (DLL files) to load
  */
-void NSClientT::loadPlugins(const std::list<std::string> plugins) {
+void NSClientT::addPlugins(const std::list<std::string> plugins) {
   ReadLock readLock(&m_mutexRW, true, 10000);
   if (!readLock.IsLocked()) {
@@ -236 +253 @@
   }
 }
+
+void NSClientT::loadPlugins() {
+  ReadLock readLock(&m_mutexRW, true, 10000);
+  if (!readLock.IsLocked()) {
+    LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+    return;
+  }
+  for (pluginList::iterator it=plugins_.begin(); it != plugins_.end(); ++it) {
+    LOG_DEBUG_STD("Loading plugin: " + (*it)->getName() + "...");
+    (*it)->load_plugin();
+  }
+}
 /**
  * Load a single plug-in using a DLL filename
@@ -241 +270 @@
  */
 void NSClientT::loadPlugin(const std::string file) {
-  LOG_DEBUG_STD("Loading: " + file);
   addPlugin(new NSCPlugin(file));
 }
@@ -249 +277 @@
  */
 void NSClientT::addPlugin(plugin_type plugin) {
-  plugin->load();
+  plugin->load_dll();
   {
     WriteLock writeLock(&m_mutexRW, true, 10000);
@@ -256 +284 @@
       return;
     }
-    // @todo Catch here and unload if we fail perhaps ?
     plugins_.insert(plugins_.end(), plugin);
     if (plugin->hasCommandHandler())
@@ -331 +358 @@
     }
   }
-  LOG_MESSAGE_STD("No handler for command: " + command);
+  LOG_MESSAGE_STD("No handler for command: '" + command + "'");
   return NSCAPI::returnIgnored;
 }
@@ -495 +522 @@
   char *c = new char[inBufLen+1];
   strncpy(c, inBuffer, inBufLen);
-  for (int i=0,j=0;i<inBufLen;i++,j++) {
+  for (unsigned int i=0,j=0;i<inBufLen;i++,j++) {
     if (j > key.size())
       j = 0;
@@ -527 +554 @@
     }
     std::string key = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_MASTERKEY, MAIN_MASTERKEY_DEFAULT);
-    for (int i=0,j=0;i<len;i++,j++) {
+    for (unsigned int i=0,j=0;i<len;i++,j++) {
       if (j > key.size())
         j = 0;