From 907df948f34c5e922412c8e5862fa858f0d8f4bd Mon Sep 17 00:00:00 2001 From: Waldek Date: Mon, 29 Mar 2021 19:22:31 +0200 Subject: [PATCH] Adding checking for COLORCODE UTF-8 --- monitor.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/monitor.py b/monitor.py index f835fc9..ad674ad 100644 --- a/monitor.py +++ b/monitor.py @@ -272,12 +272,18 @@ def add_hb_peer(_peer_conf, _ctable_loc, _peer): _ctable_peer['CALLSIGN'] = _peer_conf['CALLSIGN'].decode('utf-8').strip() else: _ctable_peer['CALLSIGN'] = _peer_conf['CALLSIGN'] - - _ctable_peer['COLORCODE'] = _peer_conf['COLORCODE'].decode('utf-8') + + if str(type(_peer_conf['COLORCODE'])).find("bytes") != -1: + _ctable_peer['COLORCODE'] = _peer_conf['COLORCODE'].decode('utf-8').strip() + else: + _ctable_peer['COLORCODE'] = _peer_conf['COLORCODE'] + _ctable_peer['CONNECTION'] = _peer_conf['CONNECTION'] _ctable_peer['CONNECTED'] = since(_peer_conf['CONNECTED']) + _ctable_peer['IP'] = _peer_conf['IP'] _ctable_peer['PORT'] = _peer_conf['PORT'] + #_ctable_peer['LAST_PING'] = _peer_conf['LAST_PING'] # SLOT 1&2 - for real-time montior: make the structure for later use