summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-23 03:08:54 +0000
committerGerrit Code Review <review@openstack.org>2019-01-23 03:08:54 +0000
commit25f4f7a45ca959de6a3f766c35edd96edc3c3b5f (patch)
treee8327519f289b2dc4933d6438f4a30757d3ade85
parentac666855848e332da5f69d871e6ef5776e0ccf87 (diff)
parent3dc386626bc36a5314922702721bf72baf9e12d5 (diff)
Merge "Fix secondary exception in fingergw"
-rw-r--r--zuul/lib/fingergw.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/zuul/lib/fingergw.py b/zuul/lib/fingergw.py
index 38cc5ec..5f46418 100644
--- a/zuul/lib/fingergw.py
+++ b/zuul/lib/fingergw.py
@@ -64,6 +64,8 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
64 This method is called by the socketserver framework to handle an 64 This method is called by the socketserver framework to handle an
65 incoming request. 65 incoming request.
66 ''' 66 '''
67 server = None
68 port = None
67 try: 69 try:
68 build_uuid = self.getCommand() 70 build_uuid = self.getCommand()
69 port_location = self.rpc.get_job_log_stream_address(build_uuid) 71 port_location = self.rpc.get_job_log_stream_address(build_uuid)
@@ -73,17 +75,15 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
73 self.request.sendall(msg.encode('utf-8')) 75 self.request.sendall(msg.encode('utf-8'))
74 return 76 return
75 77
76 self._fingerClient( 78 server = port_location['server']
77 port_location['server'], 79 port = port_location['port']
78 port_location['port'], 80 self._fingerClient(server, port, build_uuid)
79 build_uuid,
80 )
81 except BrokenPipeError: # Client disconnect 81 except BrokenPipeError: # Client disconnect
82 return 82 return
83 except Exception: 83 except Exception:
84 self.log.exception( 84 self.log.exception(
85 'Finger request handling exception (%s:%s):', 85 'Finger request handling exception (%s:%s):',
86 port_location['server'], port_location['port']) 86 server, port)
87 msg = 'Internal streaming error' 87 msg = 'Internal streaming error'
88 self.request.sendall(msg.encode('utf-8')) 88 self.request.sendall(msg.encode('utf-8'))
89 return 89 return