Skip to content
Snippets Groups Projects
Commit 30ba6ade authored by Anton Joubert's avatar Anton Joubert
Browse files

SAR-55 Remove deprecated dev_logging method

This was deprecated in a previous release, so removing it
now.  Use calls like `self.logger.info` instead.
parent 26c630fc
Branches
Tags
No related merge requests found
...@@ -280,38 +280,6 @@ class SKABaseDevice(with_metaclass(DeviceMeta, Device)): ...@@ -280,38 +280,6 @@ class SKABaseDevice(with_metaclass(DeviceMeta, Device)):
raise Exception(msg) raise Exception(msg)
return args_dict return args_dict
def dev_logging(self, dev_log_msg, dev_log_level):
"""
DEPRECATED: Log the message to the Python logger.
DEPRECATED - Use ``self.logger`` directly instead. For example,
``self.logger.info("My message")`` for something at LOG_INFO level.
:param dev_log_msg: DevString.
Message to log
:param dev_log_level: DevEnum
Logging level of the message. The message can have one of the following
logging levels:
LOG_FATAL
LOG_ERROR
LOG_WARN
LOG_INFO
LOG_DEBUG
:return: None
"""
if dev_log_level == TangoLoggingLevel.FATAL:
self.logger.fatal(dev_log_msg)
elif dev_log_level == TangoLoggingLevel.ERROR:
self.logger.error(dev_log_msg)
elif dev_log_level == TangoLoggingLevel.WARNING:
self.logger.warning(dev_log_msg)
elif dev_log_level == TangoLoggingLevel.INFO:
self.logger.info(dev_log_msg)
elif dev_log_level == TangoLoggingLevel.DEBUG:
self.logger.debug(dev_log_msg)
# PROTECTED REGION END # // SKABaseDevice.class_variable # PROTECTED REGION END # // SKABaseDevice.class_variable
# ----------------- # -----------------
......
...@@ -381,13 +381,3 @@ class TestSKABaseDevice(object): ...@@ -381,13 +381,3 @@ class TestSKABaseDevice(object):
with pytest.raises(Exception): with pytest.raises(Exception):
SKABaseDevice._parse_argin( SKABaseDevice._parse_argin(
SKABaseDevice, '{"class":"SKABaseDevice"}', required=['missing']) SKABaseDevice, '{"class":"SKABaseDevice"}', required=['missing'])
# TODO: Fix this test case when "__DeviceImpl__debug_stream() missing 'msg' argument" is resolved.
# def test_dev_logging(self, tango_context):
# SKABaseDevice._central_logging_level = int(tango.LogLevel.LOG_DEBUG)
# SKABaseDevice._element_logging_level = int(tango.LogLevel.LOG_DEBUG)
# SKABaseDevice._storage_logging_level = int(tango.LogLevel.LOG_DEBUG)
# result = SKABaseDevice.dev_logging(SKABaseDevice, "test message", int(tango.LogLevel.LOG_DEBUG))
# result = []
# SKABaseDevice.error_stream(SKABaseDevice, "Syslog cannot be initialized")
# assert result == None
...@@ -187,11 +187,11 @@ class SKATestDevice(with_metaclass(DeviceMeta, SKABaseDevice)): ...@@ -187,11 +187,11 @@ class SKATestDevice(with_metaclass(DeviceMeta, SKABaseDevice)):
def On(self): def On(self):
# PROTECTED REGION ID(SKATestDevice.On) ENABLED START # # PROTECTED REGION ID(SKATestDevice.On) ENABLED START #
"""Starts the device""" """Starts the device"""
self.dev_logging("TurnOn Sending DEBUG", int(tango.LogLevel.LOG_DEBUG)) self.logger.debug("TurnOn Sending DEBUG")
self.dev_logging("TurnOn Sending INFO", int(tango.LogLevel.LOG_INFO)) self.logger.info("TurnOn Sending INFO")
self.dev_logging("TurnOn Sending WARNING", int(tango.LogLevel.LOG_WARN)) self.logger.warning("TurnOn Sending WARNING")
self.dev_logging("TurnOn Sending ERROR", int(tango.LogLevel.LOG_ERROR)) self.logger.error("TurnOn Sending ERROR")
self.dev_logging("TurnOn Sending FATAL", int(tango.LogLevel.LOG_FATAL)) self.logger.critical("TurnOn Sending CRITICAL")
#TODO: Set state to ON #TODO: Set state to ON
# PROTECTED REGION END # // SKATestDevice.On # PROTECTED REGION END # // SKATestDevice.On
...@@ -201,11 +201,11 @@ class SKATestDevice(with_metaclass(DeviceMeta, SKABaseDevice)): ...@@ -201,11 +201,11 @@ class SKATestDevice(with_metaclass(DeviceMeta, SKABaseDevice)):
def Stop(self): def Stop(self):
# PROTECTED REGION ID(SKATestDevice.Stop) ENABLED START # # PROTECTED REGION ID(SKATestDevice.Stop) ENABLED START #
"""Stops the device""" """Stops the device"""
self.dev_logging("TurnOFF Sending DEBUG", int(tango.LogLevel.LOG_DEBUG)) self.logger.debug("TurnOFF Sending DEBUG")
self.dev_logging("TurnOFF Sending INFO", int(tango.LogLevel.LOG_INFO)) self.logger.info("TurnOFF Sending INFO")
self.dev_logging("TurnOFF Sending WARNING", int(tango.LogLevel.LOG_WARN)) self.logger.warning("TurnOFF Sending WARNING")
self.dev_logging("TurnOFF Sending ERROR", int(tango.LogLevel.LOG_ERROR)) self.logger.error("TurnOFF Sending ERROR")
self.dev_logging("TurnOFF Sending FATAL", int(tango.LogLevel.LOG_FATAL)) self.logger.critical("TurnOFF Sending CRITICAL")
# TODO: Set state to OFF # TODO: Set state to OFF
# PROTECTED REGION END # // SKATestDevice.Stop # PROTECTED REGION END # // SKATestDevice.Stop
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment