diff --git a/server/web/Flask_server.py b/server/web/Flask_server.py index 8899456..ebb4b30 100755 --- a/server/web/Flask_server.py +++ b/server/web/Flask_server.py @@ -231,6 +231,8 @@ def server_management(): last_updated = redis_server_metadata.hget('analyzer:{}'.format(analyzer_uuid), 'last_updated') if last_updated is None: last_updated = 'Never' + else: + last_updated = datetime.datetime.fromtimestamp(float(last_updated)).strftime('%Y-%m-%d %H:%M:%S') len_queue = redis_server_analyzer.llen('analyzer:{}:{}'.format(type, analyzer_uuid)) if len_queue is None: len_queue = 0 diff --git a/server/workers/workers_8/worker.py b/server/workers/workers_8/worker.py index af02b8d..ebf2f1f 100755 --- a/server/workers/workers_8/worker.py +++ b/server/workers/workers_8/worker.py @@ -154,7 +154,7 @@ if __name__ == "__main__": # get new save_path dir_full_path = get_save_dir(dir_data_uuid, date_file[0:4], date_file[4:6], date_file[6:8]) filename = '{}-{}-{}-{}-{}.passivedns.txt'.format(uuid, date_file[0:4], date_file[4:6], date_file[6:8], date_file[8:14]) - save_path = os.path.join([dir_full_path, filename]) + save_path = os.path.join(dir_full_path, filename) # save start of new file if start_new_file != b'':