Skip to content

Commit a12d0ca

Browse files
committed
Changed to threading, added linesep to fake server response string
1 parent c67f031 commit a12d0ca

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

fake_server/fake_server.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
"""
1010

1111
# import multiprocessing
12-
import gevent
13-
from gevent import monkey
14-
monkey.patch_all()
12+
import threading
13+
# import gevent
14+
# from gevent import monkey
15+
# monkey.patch_all()
1516
import os
16-
from gevent import socket
17-
from gevent.event import Event
17+
import socket
18+
# from gevent import socket
19+
from threading import Event
1820
import sys
1921
import traceback
2022
import logging
@@ -59,7 +61,7 @@ def check_channel_exec_request(self, channel, cmd):
5961
cmd = cmd.replace('\"', "")
6062
if not cmd in self.cmd_req_response:
6163
return False
62-
channel.send(self.cmd_req_response[cmd])
64+
channel.send(self.cmd_req_response[cmd] + os.linesep)
6365
channel.send_exit_status(0)
6466
self.event.set()
6567
return True
@@ -150,14 +152,18 @@ def handle_ssh_connection(cmd_req_response, sock, fail_auth = False):
150152
return
151153

152154
def start_server(cmd_req_response, sock, fail_auth=False):
153-
return gevent.spawn(listen, cmd_req_response, sock, fail_auth=fail_auth)
155+
t = threading.Thread(target=listen, args=(cmd_req_response, sock,),
156+
kwargs={'fail_auth' : fail_auth})
157+
t.start()
158+
return t
159+
# return gevent.spawn(listen, cmd_req_response, sock, fail_auth=fail_auth)
154160

155161
if __name__ == "__main__":
156162
logging.basicConfig()
157163
logger.setLevel(logging.DEBUG)
158164
sock = make_socket('127.0.0.1')
159-
server = start_server({'fake' : 'fake response' + os.linesep}, sock)
165+
server = start_server({'fake' : 'fake response'}, sock)
160166
try:
161-
server.get()
167+
server.join()
162168
except KeyboardInterrupt:
163169
sys.exit(0)

0 commit comments

Comments
 (0)