fix: mergeconflict and log filename

zmq_subscriber.py

@@ -73,6 +73,6 @@ if __name__ == "__main__":
     args = parser.parse_args()
 
     try:
-        main(args.zmqname)
+        main(args.zmqname, args.zmqurl)
     except redis.exceptions.ResponseError as error:
         print(error)

zmq_subscribers.py

@@ -19,7 +19,7 @@ configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/c
 cfg = configparser.ConfigParser()
 cfg.read(configfile)
 logDir = cfg.get('Log', 'directory')
-logfilename = cfg.get('Log', 'filename')
+logfilename = cfg.get('Log', 'subscriber_filename')
 logPath = os.path.join(logDir, logfilename)
 if not os.path.exists(logDir):
     os.makedirs(logDir)