Changeset 7ec3dd1 in nscp for service/NSClient++.h

Timestamp:

06/16/11 23:00:44 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e11d494

Parents:

3bdaf18

Message:

various fixes and changes here and there
Mainly build related (been trying to fix symbol dumper problems) as well as tweaks for the up-coming "nightly release")

File:

• service/NSClient++.h (modified) (5 diffs)

service/NSClient++.h

@@ -96 +96 @@
   //boost::shared_mutex m_mutexRWcmdDescriptions;
   //cmdMap cmdDescriptions_;
-  enum log_status {log_unknown, log_looking, log_debug, log_nodebug };
+  enum log_status {log_state_unknown, log_state_looking, log_state_debug, log_state_nodebug };
   log_status debug_;
   std::wstring context_;
@@ -117 +117 @@
   typedef std::multimap<std::wstring,std::wstring> plugin_alias_list_type;
   // c-tor, d-tor
-  NSClientT(void) : debug_(log_unknown), enable_shared_session_(false), commands_(this), channels_(this), next_plugin_id_(0), service_name_(DEFAULT_SERVICE_NAME) {
+  NSClientT(void) : debug_(log_state_unknown), enable_shared_session_(false), commands_(this), channels_(this), next_plugin_id_(0), service_name_(DEFAULT_SERVICE_NAME) {
     logger_master_.start_slave();
   }
@@ -123 +123 @@
   void enableDebug(bool debug = true) {
     if (debug)
-      debug_ = log_debug;
+      debug_ = log_state_debug;
     else
-      debug_ = log_nodebug;
+      debug_ = log_state_nodebug;
   }
 
@@ -145 +145 @@
   // Service API
   static NSClient* get_global_instance();
+  /*
   void handle_error(unsigned int line, const char *file, std::wstring message) {
     std::string s = nsclient::logger_helper::create_error(file, line, message);
     reportMessage(s.c_str());
   }
+  */
   void handle_startup(std::wstring service_name);
   void handle_shutdown(std::wstring service_name);
@@ -222 +224 @@
     void load_all_plugins(int mode);
 
+    static void log_debug(const char* file, const int line, std::wstring message);
+    static void log_error(const char* file, const int line, std::wstring message);
+    static void log_error(const char* file, const int line, std::string message);
+    static void log_info(const char* file, const int line, std::wstring message);
+
+
 
   private: