storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some stuff

Browse Source
This commit is contained in:
chrys 2018-09-07 00:56:29 +02:00
parent 800e950a7e
commit 69ffffc7a4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fenrirscreenreader/core/remoteManager.py
View File

@ -39,8 +39,7 @@ class remoteManager():
pass pass
def initialize(self, environment): def initialize(self, environment):
self.env = environment self.env = environment
self.env['runtime']['processManager'].addCustomEventThread(self.unixSocketWatchDog, multiprocess=True)
return
if self.env['runtime']['settingsManager'].getSettingAsBool('remote', 'enabled'): if self.env['runtime']['settingsManager'].getSettingAsBool('remote', 'enabled'):
if self.env['runtime']['settingsManager'].getSetting('remote', 'method') == 'unix': if self.env['runtime']['settingsManager'].getSetting('remote', 'method') == 'unix':
self.env['runtime']['processManager'].addCustomEventThread(self.unixSocketWatchDog, multiprocess=True) self.env['runtime']['processManager'].addCustomEventThread(self.unixSocketWatchDog, multiprocess=True)
@ -51,7 +50,7 @@ class remoteManager():
self.sock.close() self.sock.close()
self.sock = None self.sock = None
def unixSocketWatchDog(self, active, eventQueue): def unixSocketWatchDog(self, active, eventQueue):
# echo "#<=>#command##exec#say##this is a test" | socat - UNIX-CLIENT:/tmp/fenrir-deamon.sock # echo "command say this is a test" | socat - UNIX-CLIENT:/tmp/fenrir-deamon.sock
# socket daemon # socket daemon
# /run/user/<uid>/fenrirscreenreader/daemon # /run/user/<uid>/fenrirscreenreader/daemon
# socket pty # socket pty
@ -59,7 +58,7 @@ class remoteManager():
socketpath = '/tmp/fenrir-deamon.sock' socketpath = '/tmp/fenrir-deamon.sock'
if os.path.exists(socketpath): if os.path.exists(socketpath):
os.remove(socketpath) os.remove(socketpath)
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.sock.bind(socketpath) self.sock.bind(socketpath)
self.sock.listen(1) self.sock.listen(1)
while active.value == 1: while active.value == 1:
@ -84,7 +83,7 @@ class remoteManager():
self.sock.close() self.sock.close()
self.sock = None self.sock = None
def tcpWatchDog(self, active, eventQueue): def tcpWatchDog(self, active, eventQueue):
# echo "#<=>#command##exec#say##this is a test" | nc localhost 22447 # echo "command say this is a test" | nc localhost 22447
# port should be configureable # port should be configureable
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)