Changeset f40d813 in nscp for modules

Timestamp:

05/18/10 21:26:56 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

b0fda46

Parents:

9661f81

Message:

2010-05-17 MickeM

• Fixed id is considerd an int (not a string) in the eventlog filter

Location:

modules

Files:

• CheckEventLog/CheckEventLog.cpp (modified) (10 diffs)
• CheckExternalScripts/CheckExternalScripts.cpp (modified) (1 diff)
• LUAScript/LUAScript.cpp (modified) (2 diffs)

modules/CheckEventLog/CheckEventLog.cpp

@@ -79 +79 @@
         using namespace parsers::where;
         insert(types)
-          (_T("id"), (type_string))
+          (_T("id"), (type_int))
           (_T("source"), (type_string))
           (_T("type"), (type_int))
@@ -140 +140 @@
         if (key == _T("source"))
           ret = &type_obj::get_source;
-        if (key == _T("message"))
+        else if (key == _T("message"))
           ret = &type_obj::get_message;
-        if (key == _T("strings"))
+        else if (key == _T("strings"))
           ret = &type_obj::get_strings;
+        else
+          NSC_DEBUG_MSG_STD(_T("Failed to bind (string): ") + key);
         return ret;
       }
@@ -150 +152 @@
         if (key == _T("id"))
           ret = &type_obj::get_id;
-        if (key == _T("type"))
+        else if (key == _T("type"))
           ret = &type_obj::get_el_type;
-        if (key == _T("severity"))
+        else if (key == _T("severity"))
           ret = &type_obj::get_severity;
-        if (key == _T("generated"))
+        else if (key == _T("generated"))
           ret = &type_obj::get_generated;
-        if (key == _T("written"))
+        else if (key == _T("written"))
           ret = &type_obj::get_written;
+        else
+          NSC_DEBUG_MSG_STD(_T("Failed to bind (int): ") + key);
         return ret;
       }
@@ -236 +240 @@
   virtual bool match(EventLogRecord &record) = 0;
   virtual std::wstring get_name() = 0;
+  virtual std::wstring get_subject() = 0;
 };
 
@@ -278 +283 @@
     return _T("deprecated");
   }
+  std::wstring get_subject() { return _T("TODO"); }
 
 };
@@ -322 +328 @@
     return _T("old");
   }
+  std::wstring get_subject() { return _T("TODO"); }
 };
 
@@ -380 +387 @@
     return _T("where");
   }
+  std::wstring get_subject() { return data.filter; }
 };
 
@@ -406 +414 @@
     NSC_LOG_ERROR_STD(_T("Failed to register command."));
   }
+  /*
   parse(_T("321 = 123"));
   parse(_T("123 = 123"));
@@ -446 +455 @@
   parse(_T("ccc = -333 AND ccc = to_date('AABBCC', 1234) OR aaa = 123x"));
   parse(_T("ccc = -333 AND ccc = to_date('AABBCC', 1234) OR aaa = 123x OR 123r = foo123"));
-
+*/
   return true;
 }
@@ -682 +691 @@
   _time64(&ltime);
 
-  NSC_DEBUG_MSG_STD(_T("Using: ") + filter_impl->get_name());
+  NSC_DEBUG_MSG_STD(_T("Using: ") + filter_impl->get_name() + _T(" ") + filter_impl->get_subject());
 
   if (!filter_impl->validate(message)) {

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -122 +122 @@
   }
   std::list<std::wstring> wscript = NSCModuleHelper::getSettingsSection(EXTSCRIPT_WRAPPED_SCRIPT_SECTION_TITLE);
-  for (it = wrappings.begin(); it != wscript.end(); ++it) {
+  for (it = wscript.begin(); it != wscript.end(); ++it) {
     std::wstring val = NSCModuleHelper::getSettingsString(EXTSCRIPT_WRAPPED_SCRIPT_SECTION_TITLE, *it, _T(""));
     if (!(*it).empty() && !val.empty()) {

modules/LUAScript/LUAScript.cpp

@@ -25 +25 @@
 #include <filter_framework.hpp>
 #include <error.hpp>
+#include <file_helpers.hpp>
 
 
@@ -59 +60 @@
 bool LUAScript::loadScript(const std::wstring file) {
   try {
-    script_wrapper::lua_script *script = new script_wrapper::lua_script(file);
+    std::wstring file_ = file;
+
+    if (!file_helpers::checks::exists(file_)) {
+      file_ = NSCModuleHelper::getBasePath() + 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);