Changeset 70f2d7b in nscp for NSClient++.cpp

Timestamp:

03/29/06 22:19:32 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

76aafc4

Parents:

aabbd97

Message:

Updated with reg settings (take 1)

File:

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

NSClient++.cpp

@@ -20 +20 @@
 #include <Socket.h>
 #include <b64/b64.h>
+#include <config.h>
 
 
@@ -65 +66 @@
       g_bConsoleLog = true;
       std::string password;
-      Settings::getInstance()->setFile(mainClient.getBasePath() + "NSC.ini");
+      try {
+        Settings::getInstance()->setFile(mainClient.getBasePath() + "NSC.ini");
+      } catch (SettingsException e) {
+        std::cout << "Could not find settings: " << e.getMessage() << std::endl;;
+        return 1;
+      }
       std::cout << "Enter password to encrypt (has to be a single word): ";
       std::cin >> password;
@@ -97 +103 @@
 #endif
       g_bConsoleLog = true;
-      mainClient.InitiateService();
+      if (!mainClient.InitiateService()) {
+        LOG_ERROR_STD("Service *NOT* started!");
+        return -1;
+      }
+      LOG_MESSAGE_STD("Using settings from: " + Settings::getInstance()->getActiveType());
       LOG_MESSAGE("Enter command to inject or exit to terminate...");
       std::string s = "";
@@ -146 +156 @@
  * When the program is started as a service this will be the entry point.
  */
-void NSClientT::InitiateService(void) {
-  Settings::getInstance()->setFile(getBasePath() + "NSC.ini");
-
+bool NSClientT::InitiateService(void) {
+  try {
+    Settings::getInstance()->setFile(getBasePath() + "NSC.ini");
+  } catch (SettingsException e) {
+    LOG_ERROR_STD("Could not find settings: " + e.getMessage());
+    return false;
+  }
   try {
     simpleSocket::WSAStartup();
   } catch (simpleSocket::SocketException e) {
     LOG_ERROR_STD("Uncaught exception: " + e.getMessage());
+    return false;
   }
 
@@ -161 +176 @@
     } catch(const NSPluginException& e) {
       LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
+      return false;
     }
   }
   loadPlugins();
+  return true;
 }
 /**