diff --git a/config/config.cfg.default b/config/config.cfg.default index cdb6eed..ff2bbaa 100644 --- a/config/config.cfg.default +++ b/config/config.cfg.default @@ -51,7 +51,6 @@ channelLastAwards = lastAwards [RedisMap] db=1 -channelProc=CoordToProcess channelDisp=PicToDisplay pathMaxMindDB=./data/GeoLite2-City_20171003/GeoLite2-City.mmdb diff --git a/server.py b/server.py index d435203..9611bcc 100755 --- a/server.py +++ b/server.py @@ -112,14 +112,6 @@ class EventMessage(): to_ret = { 'log': self.feed, 'feedName': self.feedName, 'zmqName': self.zmqName } return 'data: {}\n\n'.format(json.dumps(to_ret)) -''' GENERAL ''' -def getZrange(keyCateg, date, topNum, endSubkey=""): - date_str = util.getDateStrFormat(date) - keyname = "{}:{}{}".format(keyCateg, date_str, endSubkey) - data = serv_redis_db.zrange(keyname, 0, topNum-1, desc=True, withscores=True) - data = [ [record[0].decode('utf8'), record[1]] for record in data ] - return data - ########### ## ROUTE ## ########### diff --git a/util.py b/util.py index 5f937e6..dda9f44 100644 --- a/util.py +++ b/util.py @@ -1,7 +1,5 @@ import datetime, time -ONE_DAY = 60*60*24 - def getZrange(serv_redis_db, keyCateg, date, topNum, endSubkey=""): date_str = getDateStrFormat(date) keyname = "{}:{}{}".format(keyCateg, date_str, endSubkey) diff --git a/zmq_subscriber.py b/zmq_subscriber.py index ae38207..81c6383 100755 --- a/zmq_subscriber.py +++ b/zmq_subscriber.py @@ -27,7 +27,6 @@ ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url') CHANNEL = cfg.get('RedisLog', 'channel') CHANNEL_LASTCONTRIB = cfg.get('RedisLog', 'channelLastContributor') CHANNEL_LASTAWARDS = cfg.get('RedisLog', 'channelLastAwards') -CHANNEL_PROC = cfg.get('RedisMap', 'channelProc') DEFAULT_PNTS_REWARD = cfg.get('CONTRIB', 'default_pnts_per_contribution') categories_in_datatable = json.loads(cfg.get('CONTRIB', 'categories_in_datatable')) @@ -35,7 +34,6 @@ DICO_PNTS_REWARD = {} temp = json.loads(cfg.get('CONTRIB', 'pnts_per_contribution')) for categ, pnts in temp: DICO_PNTS_REWARD[categ] = pnts -MAX_NUMBER_OF_LAST_CONTRIBUTOR = cfg.getint('CONTRIB', 'max_number_of_last_contributor') serv_log = redis.StrictRedis( host=cfg.get('RedisGlobal', 'host'), @@ -320,10 +318,13 @@ def main(zmqName): socket.setsockopt_string(zmq.SUBSCRIBE, '') while True: - content = socket.recv() - content.replace(b'\n', b'') # remove \n... - zmq_name = zmqName - process_log(zmq_name, content) + try: + content = socket.recv() + content.replace(b'\n', b'') # remove \n... + zmq_name = zmqName + process_log(zmq_name, content) + except KeyboardInterrupt: + return dico_action = {