Changeset b7d17f8 in nscp for modules

Timestamp:

04/11/11 06:33:49 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

d66ccee

Parents:

c391984

Message:

0.4.x: Major update with a lot of fixes and what not.
Now NSCA is working with old config file as well as a brand new http settings store and many many other fixes.

Location:

modules

Files:

• CheckDisk/filter.cpp (modified) (2 diffs)
• NSCAAgent/NSCAAgent.cpp (modified) (1 diff)
• Scheduler/Scheduler.cpp (modified) (2 diffs)

modules/CheckDisk/filter.cpp

@@ -35 +35 @@
       (_T("accessed"), (type_date))
       (_T("written"), (type_date))
-      (_T("generated"), (type_date));
+      (_T("created"), (type_date));
   }
 
@@ -77 +77 @@
   else if (key == _T("line_count"))
     ret = &object_type::get_line_count;
-  else if (key == _T("access"))
+  else if (key == _T("accessed"))
     ret = &object_type::get_access;
-  else if (key == _T("creation"))
+  else if (key == _T("created"))
     ret = &object_type::get_creation;
   else if (key == _T("written"))

modules/NSCAAgent/NSCAAgent.cpp

@@ -149 +149 @@
 NSCAPI::nagiosReturn NSCAAgent::handleSimpleNotification(const std::wstring channel, const std::wstring command, NSCAPI::nagiosReturn code, std::wstring msg, std::wstring perf) {
   try {
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * Handling command: ") + command);
     boost::asio::io_service io_service;
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * message: ") + msg);
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * performance: ") + perf);
     nsca::socket socket(io_service);
     socket.connect(nscahost_, nscaport_);
     nsca::packet packet(hostname_, payload_length_, time_delta_);
     packet.code = code;
-    packet.host = "hello";
-    packet.result = to_string(msg) + "|" + to_string(perf);
+    packet.service = utf8::cvt<std::string>(command);
+    packet.result = utf8::cvt<std::string>(msg) + "|" + utf8::cvt<std::string>(perf);
     socket.recv_iv(password_, encryption_method_, boost::posix_time::seconds(timeout_));
     socket.send_nsca(packet, boost::posix_time::seconds(timeout_));
     return NSCAPI::isSuccess;
+  } catch (nsca::nsca_encrypt::encryption_exception &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to encrypt data: ") + e.getMessage());
+    return NSCAPI::hasFailed;
+    
   } catch (std::exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to send data: ") + to_wstring(e.what()));

modules/Scheduler/Scheduler.cpp

@@ -109 +109 @@
     _T("SCHEDULE COMMAND"), _T("Command to execute"))
 
+    (_T("alias"), sh::wstring_key(&item.alias, def==NULL?_T(""):def->alias),
+    _T("SCHEDULE ALIAS"), _T("The alias (service name) to report to server"))
+
     (_T("report"), sh::wstring_key(&report, def==NULL?_T("all"):nscapi::report::to_string(def->report)),
     _T("REPORT MODE"), _T("What to report to the server (any of the following: all, critical, warning, unknown, ok)"))
@@ -130 +133 @@
   scheduler::target item = read_schedule(path + _T("/") + alias, alias, &def);
   strEx::parse_command(item.command, item.command, item.arguments);
+  NSC_DEBUG_MSG_STD(_T("Adding scheduled task: ") + alias);
   scheduler_.add_task(item);
 }