xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-27 19:37:44 +00:00
Code Issues Projects Releases Wiki Activity

Handle disconnect notification without session

Browse Source 
If session no longer exists, do not try to manipulate it's keepalives.
Remove instances of calling the function where it would be redundant.

Change-Id: I2011f8012175ef12ce83eb34fbf4de9650fb157e
This commit is contained in:
Jarrod Johnson 2016-09-14 15:08:03 -04:00
parent c35781d4cf
commit 77d7d373c3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyghmi/ipmi/console.py
View File

@ -146,7 +146,6 @@ class Console(object):
def _got_payload_instance_info(self, response):
if 'error' in response:
self.activated = False
self.ipmi_session.unregister_keepalive(self.keepaliveid)
self._print_error(response['error'])
return
currowner = struct.unpack(
@ -154,7 +153,6 @@ class Console(object):
if currowner[0] != self.ipmi_session.sessionid:
# the session is deactivated or active for something else
self.activated = False
self.ipmi_session.unregister_keepalive(self.keepaliveid)
self._print_error('SOL deactivated')
return
# ok, still here, that means session is alive, but another
@ -184,7 +182,8 @@ class Console(object):
def close(self):
"""Shut down an SOL session,
"""
self.ipmi_session.unregister_keepalive(self.keepaliveid)
if self.ipmi_session:
self.ipmi_session.unregister_keepalive(self.keepaliveid)
if self.activated:
try:
self.ipmi_session.raw_command(netfn=6, command=0x49,