zuul
/
zuul
Code Issues Proposed changes

Fix secondary exception in fingergw 

A recent change addded more information to the fingergw exception
handler.  In some cases those variables can be undefined.  Ensure
we use initialized variables in the exception handler.

Change-Id: I3636f4d208a1c35245581129c5690dc70e39336a
This commit is contained in:
James E. Blair 2019-01-22 15:35:44 -08:00
parent ed7f9da75e
commit 3dc386626b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zuul/lib/fingergw.py
View File

@ -64,6 +64,8 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
This method is called by the socketserver framework to handle an This method is called by the socketserver framework to handle an
incoming request. incoming request.
''' '''
server = None
port = None
try: try:
build_uuid = self.getCommand() build_uuid = self.getCommand()
port_location = self.rpc.get_job_log_stream_address(build_uuid) port_location = self.rpc.get_job_log_stream_address(build_uuid)
@ -73,17 +75,15 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
self.request.sendall(msg.encode('utf-8')) self.request.sendall(msg.encode('utf-8'))
return return
self._fingerClient( server = port_location['server']
port_location['server'], port = port_location['port']
port_location['port'], self._fingerClient(server, port, build_uuid)
build_uuid,
)
except BrokenPipeError: # Client disconnect except BrokenPipeError: # Client disconnect
return return
except Exception: except Exception:
self.log.exception( self.log.exception(
'Finger request handling exception (%s:%s):', 'Finger request handling exception (%s:%s):',
port_location['server'], port_location['port']) server, port)
msg = 'Internal streaming error' msg = 'Internal streaming error'
self.request.sendall(msg.encode('utf-8')) self.request.sendall(msg.encode('utf-8'))
return return