Changeset a44cb15 in nscp for include/nscapi/nscapi_core_wrapper.cpp

Timestamp:

09/02/11 07:38:44 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

a14aa07

Parents:

3b11e65

Message:

• Implemented registration of channels (so no longer faked)
• Added settings key to change the NSCAAgent channel name
• Addded proper channel handling to PythonScript module
• Improved error handling in channels API
• Rewrote wrapper API to use templates and classes instead of macros (ish)
• Improved the internal plugin wrapping API to support multiple plugin load
• Fixed so PythonScript module supports multiple plugin load (with new argument for plugin_id)
• Added API for registrying routers and handling routing (almost there now)
• Fixed issue with messages due to new API

File:

• include/nscapi/nscapi_core_wrapper.cpp (modified) (4 diffs)

include/nscapi/nscapi_core_wrapper.cpp

@@ -129 +129 @@
   std::string request;
   nscapi::functions::create_simple_query_response(command, code, message, perf, request);
-  NSCAPI::nagiosReturn ret = NotifyChannel(channel, command, code, request);
-}
-
-
-NSCAPI::errorReturn nscapi::core_wrapper::NotifyChannel(std::wstring channel, std::wstring command, NSCAPI::nagiosReturn code, std::string result) {
+  NSCAPI::nagiosReturn ret = submit_message(channel, command, request);
+}
+
+NSCAPI::errorReturn nscapi::core_wrapper::submit_message(std::wstring channel, std::wstring command, std::string buffer) {
   if (!fNSAPINotify)
     throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
-  return fNSAPINotify(channel.c_str(), command.c_str(), code, result.c_str(), result.size());
+  return fNSAPINotify(channel.c_str(), command.c_str(), buffer.c_str(), buffer.size());
 }
 
@@ -544 +543 @@
   return ret;
 }
-void nscapi::core_wrapper::registerCommand(std::wstring command, std::wstring description) {
+void nscapi::core_wrapper::registerCommand(unsigned int id, std::wstring command, std::wstring description) {
   if (!fNSAPIRegisterCommand)
     throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
-  if (fNSAPIRegisterCommand(id_, command.c_str(), description.c_str()) != NSCAPI::isSuccess) {
-    CORE_LOG_ERROR_STD(_T("Failed to register command: ") + command + _T(" in plugin: ") + to_wstring(id_));
+  if (fNSAPIRegisterCommand(id, command.c_str(), description.c_str()) != NSCAPI::isSuccess) {
+    CORE_LOG_ERROR_STD(_T("Failed to register command: ") + command + _T(" in plugin: ") + to_wstring(id));
+  }
+}
+
+void nscapi::core_wrapper::registerSubmissionListener(unsigned int id, std::wstring channel) {
+  if (!fNSAPIRegisterSubmissionListener)
+    throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
+  if (fNSAPIRegisterSubmissionListener(id, channel.c_str()) != NSCAPI::isSuccess) {
+    CORE_LOG_ERROR_STD(_T("Failed to register channel: ") + channel + _T(" in plugin: ") + to_wstring(id));
+  }
+}
+void nscapi::core_wrapper::registerRoutingListener(unsigned int id, std::wstring channel) {
+  if (!fNSAPIRegisterRoutingListener)
+    throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
+  if (fNSAPIRegisterRoutingListener(id, channel.c_str()) != NSCAPI::isSuccess) {
+    CORE_LOG_ERROR_STD(_T("Failed to register channel: ") + channel + _T(" in plugin: ") + to_wstring(id));
   }
 }
@@ -583 +597 @@
  * @return NSCAPI::success or NSCAPI::failure
  */
-bool nscapi::core_wrapper::load_endpoints(unsigned int id, nscapi::core_api::lpNSAPILoader f) {
-  id_ = id;
+bool nscapi::core_wrapper::load_endpoints(nscapi::core_api::lpNSAPILoader f) {
   fNSAPIGetApplicationName = (nscapi::core_api::lpNSAPIGetApplicationName)f(_T("NSAPIGetApplicationName"));
   fNSAPIGetApplicationVersionStr = (nscapi::core_api::lpNSAPIGetApplicationVersionStr)f(_T("NSAPIGetApplicationVersionStr"));
@@ -624 +637 @@
   fNSAPIExpandPath = (nscapi::core_api::lpNSAPIExpandPath)f(_T("NSAPIExpandPath"));
   
+  fNSAPIRegisterSubmissionListener = (nscapi::core_api::lpNSAPIRegisterSubmissionListener)f(_T("NSAPIRegisterSubmissionListener"));
+  fNSAPIRegisterRoutingListener = (nscapi::core_api::lpNSAPIRegisterRoutingListener)f(_T("NSAPIRegisterRoutingListener"));
+
   return true;
 }