Revert to putting it around the entire block

synapse/push/__init__.py

@@ -128,6 +128,7 @@ class Pusher(object):
                 try:
                     if wait > 0:
                         yield synapse.util.async.sleep(wait)
+                    with Measure(self.clock, "push"):
                         yield self.get_and_dispatch()
                     wait = 0
                 except:
@@ -150,7 +151,6 @@ class Pusher(object):
             only_keys=("room", "receipt",),
         )
 
-        with Measure(self.clock, "push"):
         # limiting to 1 may get 1 event plus 1 presence event, so
         # pick out the actual event
         single_event = None