MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: mergeconflict and log filename

subzero
mokaddem 2019-06-21 15:32:59 +02:00
parent b06c95c907
commit cbbdf7cbfc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zmq_subscriber.py
View File

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

2
zmq_subscribers.py
View File

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