Commit a9761c66 authored by Andreas Valder's avatar Andreas Valder

Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoagwebsite/videoagwebsite

parents a78ccce1 e3495a26
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:
......
......@@ -14,7 +14,6 @@ import math
import locale
import base64
import json
import time
locale.setlocale(locale.LC_ALL, 'de_DE.utf8')
......
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment