improve multiprocessing, wait for complete and handle remtoe moregraceful

This commit is contained in:
Chrys
2019-09-05 23:01:35 +02:00
parent 59c4a2beb4
commit 05165d2868
12 changed files with 94 additions and 78 deletions

View File

@ -18,30 +18,36 @@ class driver(remoteDriver):
self.env['runtime']['processManager'].addCustomEventThread(self.watchDog, multiprocess=True)
def watchDog(self, active, eventQueue):
# echo "command say this is a test" | nc localhost 22447
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.fenrirSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.fenrirSock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.host = '127.0.0.1'
self.port = self.env['runtime']['settingsManager'].getSettingAsInt('remote', 'port')
self.sock.bind((self.host, self.port))
self.sock.listen(1)
self.fenrirSock.bind((self.host, self.port))
self.fenrirSock.listen(1)
while active.value == 1:
client_sock, client_addr = self.sock.accept()
if client_sock:
# Check if the client is still connected and if data is available:
try:
r, w, e = select.select([client_sock,], [], [])
except select.error:
return
if len(r) > 0:
rawdata = client_sock.recv(8129)
try:
data = rawdata.decode("utf-8").rstrip().lstrip()
eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
"Data": data
})
except:
pass
try:
r, _, _ = select.select([self.fenrirSock], [], [], 0.8)
except select.error:
break
if r == []:
continue
if self.fenrirSock in r:
client_sock, client_addr = self.fenrirSock.accept()
try:
rawdata = client_sock.recv(8129)
except:
pass
try:
data = rawdata.decode("utf-8").rstrip().lstrip()
eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
"Data": data
})
except:
pass
try:
client_sock.close()
if self.sock:
self.sock.close()
self.sock = None
except:
pass
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None