diff --git a/server.py b/server.py index b65103c..9c0d006 100755 --- a/server.py +++ b/server.py @@ -36,7 +36,6 @@ class LogItem(): for item in json.loads(cfg.get('Log', 'fieldname_order')): FIELDNAME_ORDER.append(item) - #def __init__(self, feed='', time='', level='level', src='source', name='name', message='wonderful meesage'): def __init__(self, feed): self.time = strftime("%H:%M:%S", now()) #FIXME Parse feed message? @@ -89,7 +88,6 @@ def index(): "{:.0f}".format(cfg.getint('Dashboard' ,'size_world_pannel_perc')/100*ratioCorrection), "{:.0f}".format((100-cfg.getint('Dashboard' ,'size_world_pannel_perc'))/100*ratioCorrection) ] - print(pannelSize) return render_template('index.html', pannelSize=pannelSize, graph_log_refresh_rate=cfg.getint('Dashboard' ,'graph_log_refresh_rate'), @@ -119,7 +117,6 @@ def event_stream_log(): def event_stream_maps(): for msg in subscriber_map.listen(): content = msg['data'].decode('utf8') - print(content) yield 'data: {}\n\n'.format(content) if __name__ == '__main__': diff --git a/zmq_subscriber.py b/zmq_subscriber.py index f82b97e..7f2f780 100755 --- a/zmq_subscriber.py +++ b/zmq_subscriber.py @@ -79,6 +79,7 @@ def handler_attribute(jsonattr): to_push = [] for field in json.loads(cfg.get('Log', 'fieldname_order')): to_push.append(jsonattr[field]) + to_push.append("blabla") #try to get coord if jsonattr['category'] == "Network activity":