diff --git a/app.py b/app.py index b818740..1e99a72 100644 --- a/app.py +++ b/app.py @@ -9,22 +9,20 @@ app = Flask(__name__) activeAlarms = list() previousAlarms = list() logs = list() +preprocessed = False def preprocess(): print('start init alarms and logs') #versuch beide files zu laden, wenn das fehlschlägt, initiiere beide files als json - with open('alarms.json', 'w') as f, open('logs.json','w') as g: - try: - alarmsFile = json.load(f) - logsFile = json.load(g) - except: - alarmsFile = list() - logsFile = list() - json.dump(alarmsFile, f, indent=2) - json.dump(logsFile, g, indent=2) - f.close() - g.close() + try: + alarmsFile = json.load(open('alarms.json')) + logsFile = json.load(open('logs.json')) + except: + alarmsFile = list() + logsFile = list() + json.dump(alarmsFile, open('alarms.json','w'), indent=2) + json.dump(logsFile, open('logs.json','w'), indent=2) # schreib alle alarme im File in previousAlarms, wenn sie älter als 2 mins sind # alle anderen in active alarms for alarm in alarmsFile: @@ -35,13 +33,15 @@ def preprocess(): # lies alle log aus dem file ein for log in logsFile: logs.append(log) + global preprocessed + preprocessed = True print("init of alarms and logs done") @app.route("/", methods=('GET', 'POST')) def index(): # wenn die logs leer sind, gehen wir davon aus, dass noch nicht initialisiert wurde # alarme werden gedoppelt, sollten schon welche da sein - if len(logs) <= 0: + if not preprocessed: preprocess() return render_template('index.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms)