external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(fastapi): unify homepage cache expiry time to five minutes

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-10-24 19:08:03 -07:00
parent 0d734eb07d
commit 7e7a1ead88
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
aurweb/routers/html.py
View file

@ -68,30 +68,29 @@ async def index(request: Request):
bases = db.query(models.PackageBase) bases = db.query(models.PackageBase)
redis = aurweb.redis.redis_connection() redis = aurweb.redis.redis_connection()
stats_expire = 300 # Five minutes. cache_expire = 300 # Five minutes.
updates_expire = 600 # Ten minutes.
# Package statistics. # Package statistics.
query = bases.filter(models.PackageBase.PackagerUID.isnot(None)) query = bases.filter(models.PackageBase.PackagerUID.isnot(None))
context["package_count"] = await db_count_cache( context["package_count"] = await db_count_cache(
redis, "package_count", query, expire=stats_expire) redis, "package_count", query, expire=cache_expire)
query = bases.filter( query = bases.filter(
and_(models.PackageBase.MaintainerUID.is_(None), and_(models.PackageBase.MaintainerUID.is_(None),
models.PackageBase.PackagerUID.isnot(None)) models.PackageBase.PackagerUID.isnot(None))
) )
context["orphan_count"] = await db_count_cache( context["orphan_count"] = await db_count_cache(
redis, "orphan_count", query, expire=stats_expire) redis, "orphan_count", query, expire=cache_expire)
query = db.query(models.User) query = db.query(models.User)
context["user_count"] = await db_count_cache( context["user_count"] = await db_count_cache(
redis, "user_count", query, expire=stats_expire) redis, "user_count", query, expire=cache_expire)
query = query.filter( query = query.filter(
or_(models.User.AccountTypeID == TRUSTED_USER_ID, or_(models.User.AccountTypeID == TRUSTED_USER_ID,
models.User.AccountTypeID == TRUSTED_USER_AND_DEV_ID)) models.User.AccountTypeID == TRUSTED_USER_AND_DEV_ID))
context["trusted_user_count"] = await db_count_cache( context["trusted_user_count"] = await db_count_cache(
redis, "trusted_user_count", query, expire=stats_expire) redis, "trusted_user_count", query, expire=cache_expire)
# Current timestamp. # Current timestamp.
now = int(datetime.utcnow().timestamp()) now = int(datetime.utcnow().timestamp())
@ -110,25 +109,25 @@ async def index(request: Request):
models.PackageBase.PackagerUID.isnot(None)) models.PackageBase.PackagerUID.isnot(None))
) )
context["seven_days_old_added"] = await db_count_cache( context["seven_days_old_added"] = await db_count_cache(
redis, "seven_days_old_added", query, expire=stats_expire) redis, "seven_days_old_added", query, expire=cache_expire)
query = updated.filter(models.PackageBase.ModifiedTS >= seven_days_ago) query = updated.filter(models.PackageBase.ModifiedTS >= seven_days_ago)
context["seven_days_old_updated"] = await db_count_cache( context["seven_days_old_updated"] = await db_count_cache(
redis, "seven_days_old_updated", query, expire=stats_expire) redis, "seven_days_old_updated", query, expire=cache_expire)
year = seven_days * 52 # Fifty two weeks worth: one year. year = seven_days * 52 # Fifty two weeks worth: one year.
year_ago = now - year year_ago = now - year
query = updated.filter(models.PackageBase.ModifiedTS >= year_ago) query = updated.filter(models.PackageBase.ModifiedTS >= year_ago)
context["year_old_updated"] = await db_count_cache( context["year_old_updated"] = await db_count_cache(
redis, "year_old_updated", query, expire=stats_expire) redis, "year_old_updated", query, expire=cache_expire)
query = bases.filter( query = bases.filter(
models.PackageBase.ModifiedTS - models.PackageBase.SubmittedTS < 3600) models.PackageBase.ModifiedTS - models.PackageBase.SubmittedTS < 3600)
context["never_updated"] = await db_count_cache( context["never_updated"] = await db_count_cache(
redis, "never_updated", query, expire=stats_expire) redis, "never_updated", query, expire=cache_expire)
# Get the 15 most recently updated packages. # Get the 15 most recently updated packages.
context["package_updates"] = updated_packages(15, updates_expire) context["package_updates"] = updated_packages(15, cache_expire)
if request.user.is_authenticated(): if request.user.is_authenticated():
# Authenticated users get a few extra pieces of data for # Authenticated users get a few extra pieces of data for