From 6319051d8a322f35f8ab5b01f5884b9d201c24f4 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Mon, 17 Jun 2013 14:52:42 -0700 Subject: [PATCH] Send timings for previous_visits to graphite. The log statement only gives us the bad cases. This should give us a fuller picture. --- r2/r2/controllers/front.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index 8f334c84f..e2d5bbe16 100755 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -167,6 +167,9 @@ class FrontController(RedditController, OAuth2ResourceController): return self.abort404() def _comment_visits(self, article, user, new_visit=None): + timer = g.stats.get_timer("gold.comment_visits") + timer.start() + hc_key = "comment_visits-%s-%s" % (user.name, article._id36) old_visits = g.hardcache.get(hc_key, []) @@ -194,6 +197,8 @@ class FrontController(RedditController, OAuth2ResourceController): copy.pop(0) g.hardcache.set(hc_key, copy, 86400 * 2) + timer.stop() + return old_visits @@ -246,15 +251,7 @@ class FrontController(RedditController, OAuth2ResourceController): c.focal_comment = comment._id36 elif (c.user_is_loggedin and c.user.gold and c.user.pref_highlight_new_comments): - #TODO: remove this profiling if load seems okay - from datetime import datetime - before = datetime.now(g.tz) previous_visits = self._comment_visits(article, c.user, c.start_time) - after = datetime.now(g.tz) - delta = (after - before) - msec = (delta.seconds * 1000 + delta.microseconds / 1000) - if msec >= 100: - g.log.warning("previous_visits code took %d msec" % msec) # check if we just came from the submit page infotext = None