diff --git a/files/helpers/cron.py b/files/helpers/cron.py index e2889caf44..bff6032169 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -40,9 +40,13 @@ def cron(every_5m, every_1h, every_1d, every_1mo): awards.award_timers_bots_task() if every_1d: + print('0', flush=True) stats.generate_charts_task(SITE) + print('1', flush=True) _sub_inactive_purge_task() + print('2', flush=True) cache.delete_memoized(route_static.stats_cached) + print('3', flush=True) route_static.stats_cached() if every_1mo: diff --git a/files/helpers/stats.py b/files/helpers/stats.py index 23cee5ca80..c144b39d11 100644 --- a/files/helpers/stats.py +++ b/files/helpers/stats.py @@ -90,6 +90,7 @@ def chart_path(kind, site): return f'/{site}_{kind}.png' def stats(site=None): + print('4', flush=True) now = time.time() day = int(now) - 86400 week = int(now) - 604800 @@ -98,6 +99,7 @@ def stats(site=None): voters = g.db.query(Vote.user_id).distinct(Vote.user_id).filter(Vote.created_utc > week).all() commentvoters = g.db.query(CommentVote.user_id).distinct(CommentVote.user_id).filter(CommentVote.created_utc > week).all() active_users = set(posters) | set(commenters) | set(voters) | set(commentvoters) + print('5', flush=True) stats = { "time": time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(now)), @@ -130,6 +132,8 @@ def stats(site=None): "users online in the past 7 days": "{:,}".format(g.db.query(User).filter(User.last_active > week).count()), } + print('6', flush=True) + if SITE_NAME == 'rDrama' or FEATURES['HOUSES']: stats2 = { "House furry members": "{:,}".format(g.db.query(User).filter(User.house.like('Furry%')).count()), @@ -143,4 +147,6 @@ def stats(site=None): } stats.update(stats2) + print('7', flush=True) + return stats