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

Make sure all except statements are no longer empty, should help a lot with debugging.

Browse Source
This commit is contained in:
Storm Dragon
2025-06-20 03:03:43 -04:00
parent 4e193f133f
commit a5ca1d28e8
42 changed files with 223 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fenrirscreenreader/remoteDriver/tcpDriver.py
View File

@ -35,19 +35,19 @@ class driver(remoteDriver):
client_sock, client_addr = self.fenrirSock.accept()
try:
rawdata = client_sock.recv(8129)
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: 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
})
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: Error decoding/queuing data: ' + str(e), debug.debugLevel.ERROR)
try:
client_sock.close()
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: Error closing client socket: ' + str(e), debug.debugLevel.ERROR)
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None

16
src/fenrirscreenreader/remoteDriver/unixDriver.py
View File

@ -22,8 +22,8 @@ class driver(remoteDriver):
socketFile = ''
try:
socketFile = self.env['runtime']['settingsManager'].getSetting('remote', 'socketFile')
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error getting socket file setting: ' + str(e), debug.debugLevel.ERROR)
if socketFile == '':
if self.env['runtime']['settingsManager'].getSetting('screen', 'driver') =='vcsaDriver':
socketFile = '/tmp/fenrirscreenreader-deamon.sock'
@ -47,19 +47,19 @@ class driver(remoteDriver):
client_sock, client_addr = self.fenrirSock.accept()
try:
rawdata = client_sock.recv(8129)
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: 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
})
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error decoding/queuing data: ' + str(e), debug.debugLevel.ERROR)
try:
client_sock.close()
except:
pass
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error closing client socket: ' + str(e), debug.debugLevel.ERROR)
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None