diff --git a/config.cfg b/config.cfg index 1ebf02f..f92e5cf 100644 --- a/config.cfg +++ b/config.cfg @@ -24,23 +24,20 @@ field_to_plot = Attribute.category fieldname_order=["Event.id", "Attribute.Tag", "Attribute.category", "Attribute.type", ["Attribute.value", "Attribute.comment"]] char_separator=|| -[RedisLog] +[RedisGlobal] host=localhost port=6251 + +[RedisLog] db=0 channel=1 -zmq_url=tcp://192.168.56.50:50000 -#zmq_url=tcp://localhost:9990 +zmq_url=tcp://localhost:50000 [RedisMap] -host=localhost -port=6251 db=1 channelProc=CoordToProcess channelDisp=PicToDisplay -pathMaxMindDB=/home/sami/Downloads/GeoLite2-City_20171003/GeoLite2-City.mmdb +pathMaxMindDB=/home/circl/Downloads/GeoLite2-City_20171003/GeoLite2-City.mmdb [RedisDB] -host=localhost -port=6250 db=2 diff --git a/server.py b/server.py index f2dc463..2c7a233 100755 --- a/server.py +++ b/server.py @@ -16,16 +16,16 @@ cfg.read(configfile) app = Flask(__name__) redis_server_log = redis.StrictRedis( - host=cfg.get('RedisLog', 'host'), - port=cfg.getint('RedisLog', 'port'), + host=cfg.get('RedisGlobal', 'host'), + port=cfg.getint('RedisGlobal', 'port'), db=cfg.getint('RedisLog', 'db')) redis_server_map = redis.StrictRedis( - host=cfg.get('RedisMap', 'host'), - port=cfg.getint('RedisMap', 'port'), + host=cfg.get('RedisGlobal', 'host'), + port=cfg.getint('RedisGlobal', 'port'), db=cfg.getint('RedisMap', 'db')) serv_redis_db = redis.StrictRedis( - host=cfg.get('RedisDB', 'host'), - port=cfg.getint('RedisDB', 'port'), + host=cfg.get('RedisGlobal', 'host'), + port=cfg.getint('RedisGlobal', 'port'), db=cfg.getint('RedisDB', 'db')) subscriber_log = redis_server_log.pubsub(ignore_subscribe_messages=True) diff --git a/static/js/index/index.js b/static/js/index/index.js index 704b45c..3b7724b 100644 --- a/static/js/index/index.js +++ b/static/js/index/index.js @@ -10,7 +10,7 @@ for(i=0; i