diff --git a/scheduler.py b/scheduler.py index 1000c4438404c9a42b255ca28c0e7abbc01f9d09..5bd30e949d32daa6e6e46b804b1b3c4ab7e0c66c 100644 --- a/scheduler.py +++ b/scheduler.py @@ -1,13 +1,14 @@ from server import * import threading import sched +from time import sleep scheduler = sched.scheduler() def run_scheduler(): - time.sleep(1) # UWSGI does weird things on startup + sleep(1) # UWSGI does weird things on startup while True: scheduler.run() - time.sleep(10) + sleep(10) def sched_func(delay, priority=0, firstdelay=None, args=[], kargs={}): if firstdelay == None: diff --git a/server.py b/server.py index 16bca01b99fda3d99a1690f66879e0ffc19e8ce1..0d6884800832851607080f4dafdd777e0a8fe1e3 100644 --- a/server.py +++ b/server.py @@ -14,7 +14,6 @@ import math import locale import base64 import json -import time locale.setlocale(locale.LC_ALL, 'de_DE.utf8') diff --git a/stats.py b/stats.py index 799e5bcb72ca5c72478f4b9a404bf10392a20bb0..6023782053610015081d2c51b3b002848983711b 100644 --- a/stats.py +++ b/stats.py @@ -2,7 +2,7 @@ from server import * import json from jobs import date_json_handler from hashlib import md5 -import datetime +from datetime import datetime @app.route('/internal/stats') @app.route('/internal/stats/<semester>') @@ -13,11 +13,11 @@ def stats(): for s in semester: year = int(s['semester'][0:4]) if s['semester'].endswith('ss'): - s['from'] = datetime.datetime(year,4,1) - s['to'] = datetime.datetime(year,10,1) + s['from'] = datetime(year,4,1) + s['to'] = datetime(year,10,1) if s['semester'].endswith('ws'): - s['from'] = datetime.datetime(year,10,1) - s['to'] = datetime.datetime(year+1,4,1) + s['from'] = datetime(year,10,1) + s['to'] = datetime(year+1,4,1) return render_template('stats.html',semester=semester,filter=request.args.get('filter')) statsqueries = {} @@ -117,7 +117,7 @@ def stats_viewsperday(req, param=""): expr = queries[req].replace('%T', '"'+query(date_subexpr%('viewsperday.'+req), param)[0]['t']+'"') params = [param]*expr.count('?') try: - modify(update_expr%('viewsperday.'+req, expr), param, *(params+[datetime.datetime.combine(datetime.date.today(), datetime.time())])) + modify(update_expr%('viewsperday.'+req, expr), param, *(params+[datetime.combine(date.today(), time())])) modify('COMMIT') except Exception: traceback.print_exc()