xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-11-03 21:02:36 +00:00
Code Issues Projects Releases Wiki Activity

Rework get_next_output

Browse Source 
Use try/except to catch nonetype case.  For whatever reason, databuffer
could still be None, this should take care of that.
This commit is contained in:
Jarrod Johnson
2014-01-28 17:11:55 -05:00
parent 892b6b53dd
commit c537a124cf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
confluent/consoleserver.py
View File

@@ -142,12 +142,13 @@ class ConsoleSession(object):
self.reaper.cancel()
currtime = util.monotonic_time()
deadline = currtime + 45
if self.databuffer is None:
try:
while len(self.databuffer) == 0 and currtime < deadline:
timeo = deadline - currtime
self.conshdl._console.wait_for_data(timeout=timeo)
currtime = util.monotonic_time()
except TypeError:
return ""
while len(self.databuffer) == 0 and currtime < deadline:
timeo = deadline - currtime
self.conshdl._console.wait_for_data(timeout=timeo)
currtime = util.monotonic_time()
retval = self.databuffer
self.databuffer = ""
self.reaper = eventlet.spawn_after(15, self.destroy)