Merge lp:~milo/linaro-patchmetrics/cached-user-check into lp:linaro-patchmetrics

[Milo Casagrande]

MP adds expiry check for cached users in the DB. Default value is set to 30 days.

=== modified file 'apps/patchwork/utils.py'
--- apps/patchwork/utils.py	2013-10-16 13:25:16 +0000
+++ apps/patchwork/utils.py	2013-12-05 18:34:32 +0000
@@ -50,6 +50,9 @@
 DEVNULL = open(os.devnull, "w")
 atexit.register(close_fo, DEVNULL)
 
+# Default date format.
+DATE_FORMAT = '%Y-%m-%d %H:%M:%S.%f'
+
 
 class GitException(Exception):
     """General class for git exceptions."""
@@ -501,9 +504,7 @@
 
     is_valid = False
     if cached_user:
-        # TODO: we need to set a timeout and check again even if the user
-        # is cached, it might have been removed from Crowd.
-        is_valid |= cached_user[1]
+        is_valid |= check_cached_user_validity(cached_user, db, crowd)
     else:
         # XXX: The first time this runs, it might hit the Crowd server hard,
         # since none of the users will be cached.
@@ -514,6 +515,25 @@
     return is_valid
 
 
+def check_cached_user_validity(cached_user, db, crowd):
+    """Checks the user timestamp, and in case re-checks user validity.
+
+    :param chached_user: The user from the local cache.
+    :param db: A PatchworkDB instance for the cache backend.
+    :param crowd: A Crowd instance to update user data if necessary.
+    """
+    date_inserted = datetime.datetime.strptime(cached_user[2], DATE_FORMAT)
+    today = datetime.datetime.now()
+    delta = today - date_inserted
+
+    valid_user = cached_user[1]
+    if delta.days >= settings.CROWD_USERS_DB_EXPIRY:
+        valid_user = crowd.is_valid_user(cached_user[0])
+        db.update_user(cached_user[0], valid_user, today)
+
+    return valid_user
+
+
 def get_patches_matching_commit(project, commit_diff, commit_msg,
                                 commit_author):
     """Return the Patch objects that are likely matches to the given commit.

=== modified file 'apps/settings.py'
--- apps/settings.py	2013-12-03 09:38:31 +0000
+++ apps/settings.py	2013-12-05 18:34:32 +0000
@@ -150,6 +150,8 @@
 # Full path to a DB file.
 # This is used to have a cache of which users exists in the Crowd database.
 CROWD_USERS_DB_FILE = None
+# Number of days before checking again if a user exists in the Crowd db.
+CROWD_USERS_DB_EXPIRY = 30
 
 # Where to store the git repos that we scan to identify which patches have
 # been committed.