From 1d4df8af3aea1c136573b0f0228dd90700783747 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 7 Aug 2018 15:43:53 -0400 Subject: [PATCH] Fix extraneous error in log on connectivity loss --- .../confluent/plugins/hardwaremanagement/ipmi.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 0b8d5e31..b75c1062 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -270,13 +270,14 @@ class IpmiConsole(conapi.Console): kg=self.kg, force=True, iohandler=self.handle_data) self.solconnection.outputlock = NullLock() - while (not self.solconnection.connected and + while (self.solconnection and not self.solconnection.connected and not (self.broken or self.solconnection.broken or self.solconnection.ipmi_session.broken)): w = eventlet.event.Event() _ipmiwaiters.append(w) w.wait(15) - if (self.broken or self.solconnection.broken or + if (self.broken or not self.solconnection or + self.solconnection.broken or self.solconnection.ipmi_session.broken): if not self.error: self.error = 'Unknown error'