From f36d51edebe4085eabd30e599b67de4217ca303e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 30 Apr 2013 13:17:38 -0400 Subject: [PATCH] Update Zephyr Mirroring liveness check for new REST API. (imported from commit d968fde21bd90510ea7bb7f85ecb9b97b41689f7) --- zephyr/views.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/zephyr/views.py b/zephyr/views.py index 5543f287a7..67d60c5a22 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -1720,9 +1720,16 @@ def json_update_active_status(request, user_profile, ret = get_status_list(user_profile) if user_profile.realm.domain == "mit.edu": try: - activity = UserActivity.objects.get(user_profile = user_profile, - query="/api/v1/get_messages", - client__name="zephyr_mirror") + # We renamed /api/v1/get_messages to /api/v1/events + try: + activity = UserActivity.objects.get(user_profile = user_profile, + query="/api/v1/events", + client__name="zephyr_mirror") + except UserActivity.DoesNotExist: + activity = UserActivity.objects.get(user_profile = user_profile, + query="/api/v1/get_messages", + client__name="zephyr_mirror") + ret['zephyr_mirror_active'] = \ (activity.last_visit.replace(tzinfo=None) > datetime.datetime.utcnow() - datetime.timedelta(minutes=5))