Commit 9e6052bb authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

fix-configure-after-scan: minor changes to logging output.

parent 4028dc62

csp-lmc-common/csp_lmc_common/CspSubarray.py

+3 −3
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ class CspSubarray(SKASubarray): 
            # may be this check is not necessary 

            if self._cmd_duration_expected[cmd_name] < (time.time() - command_start_time):

                self._timeout_expired = True

                self.logger.warn("Device went in timeout during configuration")

                self.logger.warning("Device went in timeout during configuration")

                break

            # TODO:

            # check for abort request.
@@ -2008,7 +2008,7 @@ class CspSubarray(SKASubarray): 
                        self.logger.info("Subarray is going to use the same configuration")

                        return

                except Exception as e:

                    self.logger.warn(str(e))

                    self.logger.warning(str(e))

            # go ahead and parse the received configuration

            self._validate_scan_configuration(argin)

        except tango.DevFailed as tango_err:

csp-lmc-common/csp_lmc_common/utils/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ class SubarrayRejectCmd(object): 
            if any(cmd_name in commands_to_reject for cmd_name in list_of_running_cmd):

                err_msg = ("Can't execute command {}:"

                           " command {} is already running".format(cmd_to_exec, list_of_running_cmd))

                dev_instance.logger.error(msg)

                dev_instance.logger.error(err_msg)

                tango.Except.throw_exception("Command failure",

                                             err_msg,

                                             "SubarrayRejectCmd decorator",