Changeset 54ac968 in nscp

Timestamp:

08/10/11 15:05:59 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

afd42f1

Parents:

04ef932

Message:

2011-08-10

• Fixed linus issues and defect
• Fixed some issues in the test python script regarding how prefix is handled
• Fixed PythonScript module to actually use the correct function map :)

Files:

• CMakeLists.txt (modified) (1 diff)
• changelog (modified) (1 diff)
• include/nscapi/macros.hpp (modified) (1 diff)
• include/nscapi/nscapi_helper.cpp (modified) (1 diff)
• include/settings/client/settings_client.hpp (modified) (2 diffs)
• scripts/python/test.py (modified) (2 diffs)
• service/core_api.cpp (modified) (3 diffs)

CMakeLists.txt

@@ -379 +379 @@
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${Boost_THREAD_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
   ${EXTRA_LIBS}
   ${PROTOBUF_LIBRARY}

changelog

@@ -8 +8 @@
 
 2011-08-10
+ * Fixed linus issues and defect
+ * Fixed some issues in the test python script regarding how prefix is handled
+ * Fixed PythonScript module to actually use the correct function map :)
  * 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

include/nscapi/macros.hpp

@@ -7 +7 @@
   extern "C" int NSModuleHelperInit(unsigned int id, nscapi::core_api::lpNSAPILoader f); \
   extern "C" int NSLoadModule(); \
-  extern "C" int NSLoadModuleEx(const wchar_t alias, int mode); \
+  extern "C" int NSLoadModuleEx(wchar_t* alias, int mode); \
   extern "C" void NSDeleteBuffer(char**buffer); \
   extern "C" int NSGetModuleName(wchar_t* buf, int buflen); \

include/nscapi/nscapi_helper.cpp

@@ -226 +226 @@
     return _T("WARNING");
   else
-    return _T("BAD_CODE");
+    return _T("BAD_CODE: " + strEx::itos(returnCode));
 }
 /**

include/settings/client/settings_client.hpp

@@ -590 +590 @@
                 v->key->notify(core_, v->path, v->key_name);
             }
+          } catch (const nscapi::nscapi_exception &e) {
+            core_->err(__FILE__, __LINE__, _T("Failed to notify ") + v->key_name + _T(": ") + e.msg_);
+          } catch (const std::exception &e) {
+            core_->err(__FILE__, __LINE__, _T("Failed to notify ") + v->key_name + _T(": ") + utf8::cvt<std::wstring>(e.what()));
           } catch (...) {
-            core_->err(__FILE__, __LINE__, _T("Failed to register: ") + v->key_name);
+            core_->err(__FILE__, __LINE__, _T("Failed to notify: ") + v->key_name);
           }
         }
@@ -598 +602 @@
             if (v->path)
               v->path->notify(core_, v->path_name);
+          } catch (const nscapi::nscapi_exception &e) {
+            core_->err(__FILE__, __LINE__, _T("Failed to notify ") + v->path_name + _T(": ") + e.msg_);
+          } catch (const std::exception &e) {
+            core_->err(__FILE__, __LINE__, _T("Failed to notify ") + v->path_name + _T(": ") + utf8::cvt<std::wstring>(e.what()));
           } catch (...) {
-            core_->err(__FILE__, __LINE__, _T("Failed to register: ") + v->path_name);
+            core_->err(__FILE__, __LINE__, _T("Failed to notify: ") + v->path_name);
           }
         }

scripts/python/test.py

@@ -3 +3 @@
 core = Core.get()
 
+prefix = 'py_'
 def test(arguments):
   log('inside test')
   for a in arguments:
     log('Got argument: %s'%a)
-  (retcode, msg, perf) = core.simple_query("normal", [])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, [])
   if msg != "ok got: ":
     return (status.CRITICAL, "Test failed")
-  (retcode, msg, perf) = core.simple_query("normal", ["hello"])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, ["hello"])
   if msg != "ok got: hello":
     return (status.CRITICAL, "Test failed")
-  (retcode, msg, perf) = core.simple_query("normal", ["hello", "world"])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, ["hello", "world"])
   if perf != "'args'=2":
     return (status.CRITICAL, "Test failed: -%s-"%perf)
@@ -44 +45 @@
   
 def init(alias):
-  prefix = 'py_'
   if alias:
     prefix = '%s_'%alias

service/core_api.cpp

@@ -53 +53 @@
   try {
     return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, settings_manager::get_settings()->get_string(section, key, defaultValue), NSCAPI::isSuccess);
-  } catch (...) {
-    LOG_ERROR_STD(_T("Failed to getString: ") + key);
+  } catch (settings::settings_exception e) {
+    LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+    return NSCAPI::hasFailed;
+  } catch (const std::exception &e) {
+    LOG_ERROR_STD(_T("Failed to get key: ") + utf8::cvt<std::wstring>(e.what()));
+    return NSCAPI::hasFailed;
+  } catch (...) {
+    LOG_ERROR_STD(_T("Failed to get key: <UNKNOWN EXCEPTION>"));
     return NSCAPI::hasFailed;
   }
@@ -64 +70 @@
     LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
     return defaultValue;
+  } catch (const std::exception &e) {
+    LOG_ERROR_STD(_T("Failed to get key: ") + utf8::cvt<std::wstring>(e.what()));
+    return defaultValue;
+  } catch (...) {
+    LOG_ERROR_STD(_T("Failed to get key: <UNKNOWN EXCEPTION>"));
+    return defaultValue;
   }
 }
@@ -70 +82 @@
     return settings_manager::get_settings()->get_bool(section, key, defaultValue==1);
   } catch (settings::settings_exception e) {
-    LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+    LOG_ERROR_STD(_T("Failed to get key: ") + e.getMessage());
+    return defaultValue;
+  } catch (const std::exception &e) {
+    LOG_ERROR_STD(_T("Failed to get key: ") + utf8::cvt<std::wstring>(e.what()));
+    return defaultValue;
+  } catch (...) {
+    LOG_ERROR_STD(_T("Failed to get key: <UNKNOWN EXCEPTION>"));
     return defaultValue;
   }