Skip to content

[thermalctld] Print exception using repr(e) to get more information #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleveque merged 1 commit into from
Oct 19, 2020
Merged

[thermalctld] Print exception using repr(e) to get more information #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions sonic-thermalctld/scripts/thermalctld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ try:
from sonic_py_common import daemon_base, logger
from sonic_py_common.task_base import ProcessTaskBase
except ImportError as e:
raise ImportError(str(e) + " - required module not found")
raise ImportError(repr(e) + " - required module not found")

try:
from swsscommon import swsscommon
Expand Down Expand Up @@ -220,7 +220,7 @@ class FanUpdater(logger.Logger):
try:
self._refresh_fan_status(drawer, fan, fan_index)
except Exception as e:
self.log_warning('Failed to update FAN status - {}'.format(e))
self.log_warning('Failed to update FAN status - {}'.format(repr(e)))
fan_index += 1

for psu_index, psu in enumerate(self.chassis.get_all_psus()):
Expand All @@ -229,7 +229,7 @@ class FanUpdater(logger.Logger):
try:
self._refresh_fan_status(None, fan, fan_index, '{} FAN'.format(psu_name), True)
except Exception as e:
self.log_warning('Failed to update PSU FAN status - {}'.format(e))
self.log_warning('Failed to update PSU FAN status - {}'.format(repr(e)))

self._update_led_color()

Expand Down Expand Up @@ -354,7 +354,7 @@ class FanUpdater(logger.Logger):
('led_status', str(try_get(fan_status.fan.get_status_led)))
])
except Exception as e:
self.log_warning('Failed to get led status for fan')
self.log_warning('Failed to get led status for fan - {}'.format(repr(e)))
fvs = swsscommon.FieldValuePairs([
('led_status', NOT_AVAILABLE)
])
Expand Down Expand Up @@ -491,7 +491,7 @@ class TemperatureUpdater(logger.Logger):
try:
self._refresh_temperature_status(thermal, index)
except Exception as e:
self.log_warning('Failed to update thermal status - {}'.format(e))
self.log_warning('Failed to update thermal status - {}'.format(repr(e)))

self.log_debug("End temperature updating")

Expand Down Expand Up @@ -658,8 +658,10 @@ class ThermalControlDaemon(daemon_base.DaemonBase):
thermal_manager.initialize()
thermal_manager.load(ThermalControlDaemon.POLICY_FILE)
thermal_manager.init_thermal_algorithm(chassis)
except NotImplementedError:
self.log_warning('Thermal manager is not supported on this platform.')
except Exception as e:
self.log_error('Caught exception while initializing thermal manager - {}'.format(e))
self.log_error('Caught exception while initializing thermal manager - {}'.format(repr(e)))

wait_time = ThermalControlDaemon.INTERVAL
while not self.stop_event.wait(wait_time):
Expand All @@ -668,7 +670,7 @@ class ThermalControlDaemon(daemon_base.DaemonBase):
if thermal_manager:
thermal_manager.run_policy(chassis)
except Exception as e:
self.log_error('Caught exception while running thermal policy - {}'.format(e))
self.log_error('Caught exception while running thermal policy - {}'.format(repr(e)))
elapsed = time.time() - begin
if elapsed < ThermalControlDaemon.INTERVAL:
wait_time = ThermalControlDaemon.INTERVAL - elapsed
Expand All @@ -683,7 +685,7 @@ class ThermalControlDaemon(daemon_base.DaemonBase):
if thermal_manager:
thermal_manager.deinitialize()
except Exception as e:
self.log_error('Caught exception while destroy thermal manager - {}'.format(e))
self.log_error('Caught exception while destroy thermal manager - {}'.format(repr(e)))

thermal_monitor.task_stop()

Expand Down