Changeset 04ef932 in nscp for modules

Timestamp:

08/10/11 07:37:24 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

54ac968

Parents:

e11d494

Message:

2011-08-10

• Fixed so it builds and runs on linux (but parser had issues so disabled som grammar rules whichneeds to be enabled again)
• Added a lot of freatures and cleand up the PythonScript module
• Started to merge som features from PythonScript back to Lua script

2011-08-07

• Fixed a lot of issues with PythonScript module adding suport for alias and "raw command processing"
• Fixed issue with loading plugins and aliases as well as duplicate plugin detection

2011-08-01

• Added new module: PythonScript

Location:

modules

Files:

• CheckNSCP/CheckNSCP.cpp (modified) (4 diffs)
• LUAScript/LUAScript.cpp (modified) (6 diffs)
• LUAScript/LUAScript.h (modified) (3 diffs)
• LUAScript/script_wrapper.hpp (modified) (6 diffs)
• NRPEClient/CMakeLists.txt (modified) (1 diff)
• NRPEServer/CMakeLists.txt (modified) (1 diff)
• NSCAAgent/CMakeLists.txt (modified) (1 diff)

modules/CheckNSCP/CheckNSCP.cpp

@@ -22 +22 @@
 
 #include <file_helpers.hpp>
+#include <unicode_char.hpp>
 
 #include <settings/client/settings_client.hpp>
@@ -85 +86 @@
 
 int CheckNSCP::get_crashes(std::wstring &last_crash) {
+#ifdef WIN32
   if (!file_helpers::checks::is_directory(crashFolder)) {
     return 0;
@@ -109 +111 @@
     last_crash = last_file;
   return count;
+#else
+  return 0;
+#endif
 }
 
@@ -125 +130 @@
   std::wstring last_crash;
   int crash_count = get_crashes(last_crash);
-  if (crash_count > 0)
-    strEx::append_list(msg, strEx::itos(crash_count) + _T(" crash(es), last crash: ") + last_crash, _T(", "));
+  if (crash_count > 0){
+    std::wstring tmp = strEx::itos(crash_count) + _T(" crash(es), last crash: ") + last_crash;
+    strEx::append_list(msg, tmp, _T(", "));
+  }
 
   std::wstring last_error;
   int err_count = get_errors(last_error);
-  if (err_count > 0)
-    strEx::append_list(msg, strEx::itos(err_count) + _T(" error(s), last error: ") + last_error, _T(", "));
+  if (err_count > 0) {
+    std::wstring tmp = strEx::itos(err_count) + _T(" error(s), last error: ") + last_error;
+    strEx::append_list(msg, tmp, _T(", "));
+  }
 
   if (msg.empty())

modules/LUAScript/LUAScript.cpp

@@ -46 +46 @@
   try {
 
+    root_ = get_core()->getBasePath();
+
     sh::settings_registry settings(get_settings_proxy());
     settings.set_alias(alias, _T("lua"));
@@ -52 +54 @@
       (_T("LUA SCRIPT SECTION"), _T("Section for the LUAScripts module."))
 
-      (_T("scripts"), sh::fun_values_path(boost::bind(&LUAScript::loadScript, this, _1)), 
+      (_T("scripts"), sh::fun_values_path(boost::bind(&LUAScript::loadScript, this, _1, _2)), 
       _T("LUA SCRIPTS SECTION"), _T("A list of scripts available to run from the LuaSCript module."))
       ;
@@ -62 +64 @@
 //      addAllScriptsFrom(scriptDirectory_);
 //    }
-    root_ = get_core()->getBasePath();
+
+
+
+
+    BOOST_FOREACH(script_container &script, scripts_) {
+      try {
+        boost::shared_ptr<script_wrapper::lua_script> instance = boost::shared_ptr<script_wrapper::lua_script>(new script_wrapper::lua_script(script));
+        instance->pre_load(this);
+        instances_.push_back(instance);
+      } catch (script_wrapper::LUAException e) {
+        NSC_LOG_ERROR_STD(_T("Could not load script ") + script.to_wstring() + _T(": ") + e.getMessage());
+      }
+    }
 
     //  } catch (nrpe::server::nrpe_exception &e) {
@@ -81 +95 @@
 
 void LUAScript::register_command(script_wrapper::lua_script* script, std::wstring command, std::wstring function) {
-  NSC_LOG_MESSAGE(_T("Script loading: ") + script->get_script() + _T(": ") + command);
+  NSC_LOG_MESSAGE(_T("Script loading: ") + script->get_wscript() + _T(": ") + command);
   commands_[command] = lua_func(script, function);
 }
 
-bool LUAScript::loadScript(const std::wstring file) {
+boost::optional<boost::filesystem::wpath> LUAScript::find_file(std::wstring file) {
+  std::list<boost::filesystem::wpath> checks;
+  checks.push_back(file);
+  checks.push_back(root_ / _T("scripts") / _T("lua") / file);
+  checks.push_back(root_ / _T("scripts") / file);
+  checks.push_back(root_ / _T("lua") / file);
+  checks.push_back(root_ / file);
+  BOOST_FOREACH(boost::filesystem::wpath c, checks) {
+    NSC_DEBUG_MSG_STD(_T("Looking for: ") + c.string());
+    if (boost::filesystem::exists(c))
+      return boost::optional<boost::filesystem::wpath>(c);
+  }
+  NSC_LOG_ERROR(_T("Script not found: ") + file);
+  return boost::optional<boost::filesystem::wpath>();
+}
+
+bool LUAScript::loadScript(std::wstring alias, std::wstring file) {
   try {
-    std::wstring file_ = file;
+    if (file.empty()) {
+      file = alias;
+      alias = _T("");
+    }
 
-    if (!file_helpers::checks::exists(file_)) {
-      file_ = root_ + file;
-      if (!file_helpers::checks::exists(file_)) {
-        NSC_LOG_ERROR(_T("Script not found: ") + file + _T(" (") + file_ + _T(")"));
-        return false;
-      }
-    }
-    NSC_DEBUG_MSG_STD(_T("Loading script: ") + file + _T(" (") + file_ + _T(")"));
-    script_wrapper::lua_script *script = new script_wrapper::lua_script(file_);
-    script->pre_load(this);
-    scripts_.push_back(script);
+    boost::optional<boost::filesystem::wpath> ofile = find_file(file);
+    if (!ofile)
+      return false;
+    script_container::push(scripts_, alias, *ofile);
+    NSC_DEBUG_MSG_STD(_T("Adding script: ") + ofile->string() + _T(" as ") + alias + _T(")"));
     return true;
-  } catch (script_wrapper::LUAException e) {
-    NSC_LOG_ERROR_STD(_T("Could not load script: ") + file + _T(", ") + e.getMessage());
   } catch (...) {
     NSC_LOG_ERROR_STD(_T("Could not load script: (Unknown exception) ") + file);
@@ -111 +136 @@
 
 bool LUAScript::unloadModule() {
-  for (script_list::const_iterator cit = scripts_.begin(); cit != scripts_.end() ; ++cit) {
-    delete (*cit);
-  }
-  scripts_.clear();
+  instances_.clear();
   return true;
 }
@@ -129 +151 @@
   bool error = false;
   commands_.clear();
-  for (script_list::const_iterator cit = scripts_.begin(); cit != scripts_.end() ; ++cit) {
+  for (script_list::const_iterator cit = instances_.begin(); cit != instances_.end() ; ++cit) {
     try {
       (*cit)->reload(this);
     } catch (script_wrapper::LUAException e) {
       error = true;
-      message += _T("Exception when reloading script: ") + (*cit)->get_script() + _T(": ") + e.getMessage();
-      NSC_LOG_ERROR_STD(_T("Exception when reloading script: ") + (*cit)->get_script() + _T(": ") + e.getMessage());
+      message += _T("Exception when reloading script: ") + (*cit)->get_wscript() + _T(": ") + e.getMessage();
+      NSC_LOG_ERROR_STD(_T("Exception when reloading script: ") + (*cit)->get_wscript() + _T(": ") + e.getMessage());
     } catch (...) {
       error = true;
-      message += _T("Unhandeled Exception when reloading script: ") + (*cit)->get_script();
-      NSC_LOG_ERROR_STD(_T("Unhandeled Exception when reloading script: ") + (*cit)->get_script());
+      message += _T("Unhandeled Exception when reloading script: ") + (*cit)->get_wscript();
+      NSC_LOG_ERROR_STD(_T("Unhandeled Exception when reloading script: ") + (*cit)->get_wscript());
     }
   }

modules/LUAScript/LUAScript.h

@@ -26 +26 @@
 #include "script_wrapper.hpp"
 
+#include <boost/optional.hpp>
+
+#include <scripts/functions.hpp>
+
+
 class LUAScript : public nscapi::impl::SimpleCommand, public script_wrapper::lua_handler, public nscapi::impl::simple_plugin {
 private:
@@ -41 +46 @@
   };
 
+  script_container::list_type scripts_;
+
   typedef std::map<std::wstring,lua_func> cmd_list;
-  typedef std::list<script_wrapper::lua_script*> script_list;
+  typedef std::list<boost::shared_ptr<script_wrapper::lua_script> > script_list;
 
   cmd_list commands_;
-  script_list scripts_;
-  std::wstring root_;
+  script_list instances_;
+  boost::filesystem::wpath root_;
 
 public:
@@ -71 +78 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  bool loadScript(const std::wstring script);
+  boost::optional<boost::filesystem::wpath> find_file(std::wstring file);
+  bool loadScript(std::wstring alias, std::wstring file);
   NSCAPI::nagiosReturn handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
   //NSCAPI::nagiosReturn RunLUA(const unsigned int argLen, wchar_t **char_args, std::wstring &message, std::wstring &perf);

modules/LUAScript/script_wrapper.hpp

@@ -10 +10 @@
 #include "luna.h"
 
+#include <scripts/functions.hpp>
 
 namespace script_wrapper {
@@ -304 +305 @@
   class lua_script {
     Lua_State L;
-    std::wstring script_;
-  public:
-    lua_script(const std::wstring file) : script_(file) {
+    std::string script_;
+    std::string alias_;
+  public:
+    lua_script(const script_container &script) : script_(utf8::cvt<std::string>(script.script.string())), alias_(utf8::cvt<std::string>(script.alias)) {
       load();
     }
@@ -312 +314 @@
       luaL_openlibs(L);
       nsclient_wrapper::luaopen(L);
-      //Luna<Account>::Register(L);
-      //lua_register(L, "register_command", register_command);
-
-      if (luaL_loadfile(L, strEx::wstring_to_string(script_).c_str()) != 0) {
-        throw LUAException(_T("Failed to load script: ") + script_ + _T(": ") + s2w(lua_tostring(L, -1)));
-      }
-
-    }
-    std::wstring get_script() const {
+      if (luaL_loadfile(L, script_.c_str()) != 0) {
+        throw LUAException(_T("Failed to load script: ") + get_wscript() + _T(": ") + s2w(lua_tostring(L, -1)));
+      }
+
+    }
+    std::wstring get_wscript() const {
+      return utf8::cvt<std::wstring>(script_);
+    }
+    std::string get_script() const {
       return script_;
     }
@@ -333 +335 @@
       lua_manager::set_script(L, this);
       if (lua_pcall(L, 0, 0, 0) != 0) {
-        throw LUAException(_T("Failed to parse script: ") + script_ + _T(": ") + s2w(lua_tostring(L, -1)));
+        throw LUAException(_T("Failed to parse script: ") + get_wscript() + _T(": ") + s2w(lua_tostring(L, -1)));
       }
     }
@@ -368 +370 @@
       if (!lua_isfunction(L, -1)) {
         lua_pop(L, 1); // remove function from LUA stack
-        throw LUAException(_T("Failed to run script: ") + script_ + _T(": Function not found: handle"));
+        throw LUAException(_T("Failed to run script: ") + get_wscript() + _T(": Function not found: handle"));
       }
       lua_pushstring(L, w2s(cmd).c_str()); 
@@ -382 +384 @@
       if (lua_pcall(L, 2, LUA_MULTRET, 0) != 0) {
         std::wstring err = strEx::string_to_wstring(lua_tostring(L, -1));
-        NSC_LOG_ERROR_STD(_T("Failed to call main function in script: ") + script_ + _T(": ") + err);
+        NSC_LOG_ERROR_STD(_T("Failed to call main function in script: ") + get_wscript() + _T(": ") + err);
         lua_pop(L, 1); // remove error message
         return NSCAPI::returnUNKNOWN;

modules/NRPEClient/CMakeLists.txt

@@ -30 +30 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}

modules/NRPEServer/CMakeLists.txt

@@ -44 +44 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}

modules/NSCAAgent/CMakeLists.txt

@@ -38 +38 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}