From 31fad4503166d895d1b344a093898db8810950bb Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Tue, 21 Aug 2012 16:51:20 -0700
Subject: [PATCH] stats: Clean up now-unnecessary checks for Timer validity.

---
 r2/r2/lib/cloudsearch.py | 6 ++----
 r2/r2/lib/stats.py       | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/r2/r2/lib/cloudsearch.py b/r2/r2/lib/cloudsearch.py
index cdf9c310d..3fc924adf 100644
--- a/r2/r2/lib/cloudsearch.py
+++ b/r2/r2/lib/cloudsearch.py
@@ -527,8 +527,7 @@ def basic_query(query=None, bq=None, faceting=None, size=1000,
     timer = None
     if record_stats:
         timer = g.stats.get_timer("cloudsearch_timer")
-        if timer:
-            timer.start()
+        timer.start()
     connection = httplib.HTTPConnection(search_api, 80)
     try:
         connection.request('GET', path)
@@ -551,8 +550,7 @@ def basic_query(query=None, bq=None, faceting=None, size=1000,
                                        response)
     finally:
         connection.close()
-        if timer:
-            timer.stop()
+        timer.stop()
     
     return json.loads(response)
 
diff --git a/r2/r2/lib/stats.py b/r2/r2/lib/stats.py
index eb802926c..7576add80 100644
--- a/r2/r2/lib/stats.py
+++ b/r2/r2/lib/stats.py
@@ -89,8 +89,7 @@ class Stats:
 
     def transact(self, action, service_time_sec):
         timer = self.get_timer('service_time')
-        if timer:
-            timer.send(action, service_time_sec)
+        timer.send(action, service_time_sec)
 
     def get_counter(self, name):
         if self.connection: