From 7532074417fd23e4e0ee173d7dfb08f4f1e0429d Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Mon, 4 Dec 2017 11:14:25 +0100 Subject: [PATCH] Refacto: removed useless args and vars --- zmq_dispatcher.py | 14 +++----------- zmq_subscriber.py | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py index 7a17842..aee91ce 100755 --- a/zmq_dispatcher.py +++ b/zmq_dispatcher.py @@ -22,7 +22,6 @@ configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg') cfg = configparser.ConfigParser() cfg.read(configfile) -ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url') CHANNEL = cfg.get('RedisLog', 'channel') LISTNAME = cfg.get('RedisLIST', 'listName') @@ -231,12 +230,7 @@ def process_log(zmq_name, event): print(e) -def main(zmqName, zmqurl, sleeptime): - context = zmq.Context() - socket = context.socket(zmq.SUB) - socket.connect(zmqurl) - socket.setsockopt_string(zmq.SUBSCRIBE, '') - +def main(sleeptime): numMsg = 0 while True: content = serv_list.rpop(LISTNAME) @@ -269,10 +263,8 @@ dico_action = { if __name__ == "__main__": - parser = argparse.ArgumentParser(description='A zmq subscriber. It subscribe to a ZNQ then redispatch it to the misp-dashboard') - parser.add_argument('-n', '--name', required=False, dest='zmqname', help='The ZMQ feed name', default="MISP Standard ZMQ") - parser.add_argument('-u', '--url', required=False, dest='zmqurl', help='The URL to connect to', default=ZMQ_URL) + parser = argparse.ArgumentParser(description='The ZMQ dispatcher. It pops from the redis buffer then redispatch it to the correct handlers') parser.add_argument('-s', '--sleep', required=False, dest='sleeptime', type=int, help='The number of second to wait before checking redis list size', default=5) args = parser.parse_args() - main(args.zmqname, args.zmqurl, args.sleeptime) + main(args.sleeptime) diff --git a/zmq_subscriber.py b/zmq_subscriber.py index bb44f84..e722012 100755 --- a/zmq_subscriber.py +++ b/zmq_subscriber.py @@ -50,7 +50,7 @@ def main(zmqName): if __name__ == "__main__": - parser = argparse.ArgumentParser(description='A zmq subscriber. It subscribe to a ZNQ then redispatch it to the misp-dashboard') + parser = argparse.ArgumentParser(description='A zmq subscriber. It subscribes to a ZNQ then redispatch it to the misp-dashboard') parser.add_argument('-n', '--name', required=False, dest='zmqname', help='The ZMQ feed name', default="MISP Standard ZMQ") parser.add_argument('-u', '--url', required=False, dest='zmqurl', help='The URL to connect to', default=ZMQ_URL) args = parser.parse_args()