aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/plugins/openid/store.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/mediagoblin/plugins/openid/store.py b/mediagoblin/plugins/openid/store.py
index b54cf5c8..8f9a7012 100644
--- a/mediagoblin/plugins/openid/store.py
+++ b/mediagoblin/plugins/openid/store.py
@@ -105,8 +105,6 @@ class SQLAlchemyOpenIDStore(OpenIDStore):
ononce.save()
return True
- # Need to test these cleanups, not sure if the expired Association query
- # will work
def cleanupNonces(self, _now=None):
if _now is None:
_now = int(time.time())
@@ -120,9 +118,10 @@ class SQLAlchemyOpenIDStore(OpenIDStore):
def cleanupAssociations(self):
now = int(time.time())
- expired = Association.query.filter(
- 'issued + lifetime' < now)
- count = expired.count()
- for each in expired:
- each.delete()
+ assoc = Association.query.all()
+ count = 0
+ for each in assoc:
+ if (each.lifetime + each.issued) <= now:
+ each.delete()
+ count = count + 1
return count