Browse Source

Merge "Fix secondary exception in fingergw"

tags/3.5.0
Zuul 4 months ago
parent
commit
25f4f7a45c
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      zuul/lib/fingergw.py

+ 6
- 6
zuul/lib/fingergw.py View File

@@ -64,6 +64,8 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
64 64
         This method is called by the socketserver framework to handle an
65 65
         incoming request.
66 66
         '''
67
+        server = None
68
+        port = None
67 69
         try:
68 70
             build_uuid = self.getCommand()
69 71
             port_location = self.rpc.get_job_log_stream_address(build_uuid)
@@ -73,17 +75,15 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler):
73 75
                 self.request.sendall(msg.encode('utf-8'))
74 76
                 return
75 77
 
76
-            self._fingerClient(
77
-                port_location['server'],
78
-                port_location['port'],
79
-                build_uuid,
80
-            )
78
+            server = port_location['server']
79
+            port = port_location['port']
80
+            self._fingerClient(server, port, build_uuid)
81 81
         except BrokenPipeError:   # Client disconnect
82 82
             return
83 83
         except Exception:
84 84
             self.log.exception(
85 85
                 'Finger request handling exception (%s:%s):',
86
-                port_location['server'], port_location['port'])
86
+                server, port)
87 87
             msg = 'Internal streaming error'
88 88
             self.request.sendall(msg.encode('utf-8'))
89 89
             return

Loading…
Cancel
Save