Changeset 52edb15 in nscp

Timestamp:

03/04/12 10:55:24 (16 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

836e9cd

Parents:

465147a

Message:

• Fixed issue with python unit script loading usig the wrong default options

Files:

• changelog (modified) (1 diff)
• modules/Scheduler/Scheduler.cpp (modified) (2 diffs)
• modules/Scheduler/schedules.hpp (modified) (1 diff)
• sample/CsharpSamplePlugin/Properties/AssemblyInfo.cs (added)
• scripts/python/test_python.py (modified) (1 diff)

changelog

@@ -8 +8 @@
  * Added new dot-net API (Which does not require any strange wrappers)
  * Added brand new sample C# plugin
+ * Fixed issue with python unit script loading usig the wrong default options
 
 2012-02-21 MickeM

modules/Scheduler/Scheduler.cpp

@@ -121 +121 @@
     if (code == NSCAPI::returnIgnored) {
       NSC_LOG_ERROR_STD(_T("Command was not found: ") + item.command.c_str());
+      if (item.channel.empty()) {
+        NSC_LOG_ERROR_STD(_T("No channel specified for ") + item.alias + _T(" mssage will not be sent."));
+        return;
+      }
       //make_submit_from_query(response, item.channel, item.alias);
       nscapi::functions::create_simple_submit_request(item.channel, item.command, NSCAPI::returnUNKNOWN, _T("Command was not found: ") + item.command, _T(""), response);
@@ -126 +130 @@
       get_core()->submit_message(item.channel, response, result);
     } else if (nscapi::report::matches(item.report, code)) {
+      if (item.channel.empty()) {
+        NSC_LOG_ERROR_STD(_T("No channel specified for ") + item.alias + _T(" mssage will not be sent."));
+        return;
+      }
       // @todo: allow renaming of commands here item.alias, 
       // @todo this is broken, fix this (uses the wrong message)

modules/Scheduler/schedules.hpp

@@ -113 +113 @@
         object.set_duration(_T("5m"));
         object.set_report(_T("all"));
+        object.channel = _T("NSCA");
       }
 

scripts/python/test_python.py

@@ -76 +76 @@
     conf.set_string(base_path, 'threads', '0')
 
-    default_path = '%s/python_test'%base_path
+    default_path = '%s/schedules/default'%base_path
     conf.set_string(default_path, 'channel', 'py_stress_test')
     conf.set_string(default_path, 'alias', 'stress')