[pytango] 314/483: fixes #636

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 67def47373297f08b4c38915d04beb7a1aef70f9
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Fri Nov 22 12:43:02 2013 +0000

    fixes #636
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24336 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 doc/revision.rst                     |  2 ++
 src/boost/cpp/server/device_impl.cpp | 25 ++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index e2ffd50..b7b68f8 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -96,6 +96,8 @@ Version history
 |          | - `622: PyTango broken when running on Ubuntu 13 <https://sourceforge.net/p/tango-cs/bugs/622/>`_                                                                 |
 |          | - `626: attribute_history extraction can raised an exception <https://sourceforge.net/p/tango-cs/bugs/626/>`_                                                     |
 |          | - `628: Problem in installing PyTango 8.0.3 on Scientific Linux 6 <https://sourceforge.net/p/tango-cs/bugs/628/>`_                                                |
+|          | - `635: Reading of ULong64 attributes does not work <https://sourceforge.net/p/tango-cs/bugs/635/>`_                                                              |
+|          | - `636: PyTango log messages are not filtered by level <https://sourceforge.net/p/tango-cs/bugs/636/>`_                                                           |
 +----------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 8.1.0    | *SKIPPED*                                                                                                                                                         |
 +----------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/src/boost/cpp/server/device_impl.cpp b/src/boost/cpp/server/device_impl.cpp
index 9dcea08..a5472e7 100644
--- a/src/boost/cpp/server/device_impl.cpp
+++ b/src/boost/cpp/server/device_impl.cpp
@@ -583,27 +583,42 @@ namespace PyDeviceImpl
 
     inline void debug(Tango::DeviceImpl &self, const string &msg)
     {
-        self.get_logger()->debug(msg);
+        if (self.get_logger()->is_debug_enabled()) {
+	    self.get_logger()->debug_stream() 
+	      << log4tango::LogInitiator::_begin_log << msg;
+	}
     }
 
     inline void info(Tango::DeviceImpl &self, const string &msg)
     {
-        self.get_logger()->info(msg);
+        if (self.get_logger()->is_info_enabled()) {
+	    self.get_logger()->info_stream() 
+	      << log4tango::LogInitiator::_begin_log << msg;
+	}
     }
 
     inline void warn(Tango::DeviceImpl &self, const string &msg)
     {
-        self.get_logger()->warn(msg);
+        if (self.get_logger()->is_warn_enabled()) {
+	    self.get_logger()->warn_stream() 
+	      << log4tango::LogInitiator::_begin_log << msg;
+	}
     }
 
     inline void error(Tango::DeviceImpl &self, const string &msg)
     {
-        self.get_logger()->error(msg);
+        if (self.get_logger()->is_error_enabled()) {
+	    self.get_logger()->error_stream() 
+	      << log4tango::LogInitiator::_begin_log << msg;
+	}
     }
 
     inline void fatal(Tango::DeviceImpl &self, const string &msg)
     {
-        self.get_logger()->fatal(msg);
+        if (self.get_logger()->is_fatal_enabled()) {
+	    self.get_logger()->fatal_stream() 
+	      << log4tango::LogInitiator::_begin_log << msg;
+	}
     }
     
     PyObject* get_attribute_config(Tango::DeviceImpl &self, object &py_attr_name_seq)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git