diff --git a/confluent_server/aiohmi/ipmi/console.py b/confluent_server/aiohmi/ipmi/console.py index 62dafcfe..900a47a5 100644 --- a/confluent_server/aiohmi/ipmi/console.py +++ b/confluent_server/aiohmi/ipmi/console.py @@ -170,6 +170,9 @@ class Console(object): await self._sendpendingoutput() async def _got_payload_instance_info(self, response): + if self.ipmi_session is None: + # console closed while this keepalive was in flight + return if 'error' in response: self.activated = False await self._print_error(response['error']) diff --git a/confluent_server/aiohmi/ipmi/private/session.py b/confluent_server/aiohmi/ipmi/private/session.py index 1b652666..65978901 100644 --- a/confluent_server/aiohmi/ipmi/private/session.py +++ b/confluent_server/aiohmi/ipmi/private/session.py @@ -1147,27 +1147,36 @@ class Session(object): self.logged = 1 self.maxtimeout = 4 # Switch quickly to the relogin recovery self.logontries = 1 # have one relogin waiting to heal - response = await self.raw_command(netfn=0x6, command=0x3b, - data=[self.privlevel]) - if response['code']: + try: + response = await self.raw_command(netfn=0x6, command=0x3b, + data=[self.privlevel]) if response['code'] in (0x80, 0x81) and self.privlevel == 4: # some implementations will let us get this far, # but suddenly get skiddish. Try again in such a case self.privlevel = 3 response = await self.raw_command(netfn=0x6, command=0x3b, data=[self.privlevel]) - if response['code']: - self.logged = 0 - self.onlogpayload = None - self.logging = False - self.logoutexpiry = None + except exc.IpmiException as e: + # session torn down meanwhile, fail the logon rather than + # raising into the shared event loop + self.logged = 0 + self.onlogpayload = None + self.logging = False + self.logoutexpiry = None + await self.onlogon({'error': str(e)}) + return + if response['code']: + self.logged = 0 + self.onlogpayload = None + self.logging = False + self.logoutexpiry = None - mysuffix = " while requesting privelege level %d for %s" % ( - self.privlevel, self.userid) - errstr = get_ipmi_error(response, suffix=mysuffix) - if errstr: - await self.onlogon({'error': errstr}) - return + mysuffix = " while requesting privelege level %d for %s" % ( + self.privlevel, self.userid) + errstr = get_ipmi_error(response, suffix=mysuffix) + if errstr: + await self.onlogon({'error': errstr}) + return self.logging = False self.logoutexpiry = None global KEEPALIVE_SESSIONS