dominic/MMDVMHost-Websocketboard
1
0
Fork 0
Code Releases Activity

Added logtailer-errormessage

Browse source 
Pushing Error-Messages (exceptions) from Logtailer into the Javascript Console.

Fixing some issue with utf-8 format in logfiles.

closed https://github.com/dg9vh/MMDVMHost-Websocketboard/issues/4
This commit is contained in:
Kim - DG9VH 2020-11-08 19:44:43 +01:00
parent 10dda8f3bb
commit 2253eb9ee7
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
html/js/functions.js
View file

@ -6,7 +6,7 @@ var messagecount = 0;
// M: 2020-11-07 15:41:22.601 DMR Slot 1, received network late entry from DO5DC to TG 262810 // M: 2020-11-07 15:41:22.601 DMR Slot 1, received network late entry from DO5DC to TG 262810
function logIt(message) { function logIt(message) {
if (debug == 1) { if (debug == 1 || message.startsWith("Logtailer-Errormessage:")) {
console.log(message); console.log(message);
} }
} }

13
logtailer.py
View file

@ -33,7 +33,7 @@ def view_log(websocket, path):
try: try:
parse_result = urlparse(path) parse_result = urlparse(path)
except Exception: except Exception:
raise ValueError('Fail to parse URL') raise ValueError('Fail to parse URL', format(path))
NUM_LINES = int(config['MMDVMHost']['Num_Lines']) NUM_LINES = int(config['MMDVMHost']['Num_Lines'])
path = os.path.abspath(parse_result.path) path = os.path.abspath(parse_result.path)
@ -54,9 +54,9 @@ def view_log(websocket, path):
NUM_LINES = 0 NUM_LINES = 0
logging.info(file_path) logging.info(file_path)
if not os.path.isfile(file_path): if not os.path.isfile(file_path):
raise ValueError('Not found') raise ValueError('File not found', format(file_path))
with open(file_path, newline = '\n') as f: with open(file_path, newline = '\n', encoding="utf8", errors='ignore') as f:
content = ''.join(deque(f, NUM_LINES)) content = ''.join(deque(f, NUM_LINES))
content = conv.convert(content, full=False) content = conv.convert(content, full=False)
@ -74,7 +74,7 @@ def view_log(websocket, path):
except ValueError as e: except ValueError as e:
try: try:
yield from websocket.send('<font color="red"><strong>{}</strong></font>'.format(e)) yield from websocket.send('Logtailer-Errormessage: ValueError: {}'.format(e))
yield from websocket.close() yield from websocket.close()
except Exception: except Exception:
pass pass
@ -82,6 +82,11 @@ def view_log(websocket, path):
log_close(websocket, path, e) log_close(websocket, path, e)
except Exception as e: except Exception as e:
try:
yield from websocket.send('Logtailer-Errormessage: Error: {}'.format(e))
yield from websocket.close()
except Exception:
pass
log_close(websocket, path, e) log_close(websocket, path, e)
else: else: