Most of the pep8 changes finished. Be careful, things may be horribly broken.
This commit is contained in:
@ -5,8 +5,8 @@
|
||||
# By Chrys, Storm Dragon, and contributers.
|
||||
|
||||
from fenrirscreenreader.core import debug
|
||||
from fenrirscreenreader.core.remoteDriver import remoteDriver
|
||||
from fenrirscreenreader.core.eventData import fenrirEventType
|
||||
from fenrirscreenreader.core.remoteDriver import RemoteDriver as remoteDriver
|
||||
from fenrirscreenreader.core.eventData import FenrirEventType
|
||||
|
||||
import select
|
||||
import socket
|
||||
@ -20,15 +20,15 @@ class driver(remoteDriver):
|
||||
|
||||
def initialize(self, environment):
|
||||
self.env = environment
|
||||
self.env['runtime']['processManager'].addCustomEventThread(
|
||||
self.watchDog, multiprocess=True)
|
||||
self.env['runtime']['ProcessManager'].add_custom_event_thread(
|
||||
self.watch_dog, multiprocess=True)
|
||||
|
||||
def watchDog(self, active, eventQueue):
|
||||
def watch_dog(self, active, event_queue):
|
||||
# echo "command say this is a test" | nc localhost 22447
|
||||
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(
|
||||
self.port = self.env['runtime']['SettingsManager'].get_setting_as_int(
|
||||
'remote', 'port')
|
||||
self.fenrirSock.bind((self.host, self.port))
|
||||
self.fenrirSock.listen(1)
|
||||
@ -44,24 +44,24 @@ class driver(remoteDriver):
|
||||
try:
|
||||
rawdata = client_sock.recv(8129)
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error receiving data from client: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
self.env['runtime']['DebugManager'].write_debug_out(
|
||||
'tcpDriver watch_dog: Error receiving data from client: ' + str(e),
|
||||
debug.DebugLevel.ERROR)
|
||||
try:
|
||||
data = rawdata.decode("utf-8").rstrip().lstrip()
|
||||
eventQueue.put({"Type": fenrirEventType.RemoteIncomming,
|
||||
"Data": data
|
||||
event_queue.put({"Type": FenrirEventType.remote_incomming,
|
||||
"data": data
|
||||
})
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error decoding/queuing data: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
self.env['runtime']['DebugManager'].write_debug_out(
|
||||
'tcpDriver watch_dog: Error decoding/queuing data: ' + str(e),
|
||||
debug.DebugLevel.ERROR)
|
||||
try:
|
||||
client_sock.close()
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error closing client socket: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
self.env['runtime']['DebugManager'].write_debug_out(
|
||||
'tcpDriver watch_dog: Error closing client socket: ' + str(e),
|
||||
debug.DebugLevel.ERROR)
|
||||
if self.fenrirSock:
|
||||
self.fenrirSock.close()
|
||||
self.fenrirSock = None
|
||||
|
Reference in New Issue
Block a user