server: server_thread should get server and handler

nistp521
Roman Zeyde 9 years ago
parent 78d701ecdf
commit 49b7c5e2b5

@ -45,9 +45,8 @@ def handle_connection(conn, handler):
raise raise
def server_thread(server, keys, signer): def server_thread(server, handler):
log.debug('server thread started') log.debug('server thread started')
handler = protocol.Handler(keys=keys, signer=signer)
while True: while True:
log.debug('waiting for connection on %s', server.getsockname()) log.debug('waiting for connection on %s', server.getsockname())
try: try:
@ -76,7 +75,8 @@ def serve(key_files, signer, sock_path=None):
keys = [formats.parse_public_key(k) for k in key_files] keys = [formats.parse_public_key(k) for k in key_files]
environ = {'SSH_AUTH_SOCK': sock_path, 'SSH_AGENT_PID': str(os.getpid())} environ = {'SSH_AUTH_SOCK': sock_path, 'SSH_AGENT_PID': str(os.getpid())}
with unix_domain_socket_server(sock_path) as server: with unix_domain_socket_server(sock_path) as server:
with spawn(server_thread, server=server, keys=keys, signer=signer): handler = protocol.Handler(keys=keys, signer=signer)
with spawn(server_thread, server=server, handler=handler):
try: try:
yield environ yield environ
finally: finally:

Loading…
Cancel
Save