Revision: 352
Author: bslatkin
Date: Mon Mar 15 23:00:57 2010
Log: hub: small tweaks to stat presentation
http://code.google.com/p/pubsubhubbub/source/detail?r=352

Modified:
 /trunk/hub/main.py
 /trunk/hub/topic_details.html

=======================================
--- /trunk/hub/main.py  Thu Mar 11 23:39:17 2010
+++ /trunk/hub/main.py  Mon Mar 15 23:00:57 2010
@@ -2970,19 +2970,23 @@
             DELIVERY_URL_SAMPLE_HOUR_LATENCY,
             DELIVERY_URL_SAMPLE_DAY_LATENCY,
             single_key=callback_url),
-        'delivery_domain_error': DELIVERY_SAMPLER.get_chain(
-            DELIVERY_DOMAIN_SAMPLE_MINUTE,
-            DELIVERY_DOMAIN_SAMPLE_30_MINUTE,
-            DELIVERY_DOMAIN_SAMPLE_HOUR,
-            DELIVERY_DOMAIN_SAMPLE_DAY,
-            single_key=callback_url),
-        'delivery_domain_latency': DELIVERY_SAMPLER.get_chain(
-            DELIVERY_DOMAIN_SAMPLE_MINUTE_LATENCY,
-            DELIVERY_DOMAIN_SAMPLE_30_MINUTE_LATENCY,
-            DELIVERY_DOMAIN_SAMPLE_HOUR_LATENCY,
-            DELIVERY_DOMAIN_SAMPLE_DAY_LATENCY,
-            single_key=callback_url),
       })
+      # Only show the domain stats when the subscription had a secret.
+      if subscription.secret or users.is_current_user_admin():
+        context.update({
+          'delivery_domain_error': DELIVERY_SAMPLER.get_chain(
+              DELIVERY_DOMAIN_SAMPLE_MINUTE,
+              DELIVERY_DOMAIN_SAMPLE_30_MINUTE,
+              DELIVERY_DOMAIN_SAMPLE_HOUR,
+              DELIVERY_DOMAIN_SAMPLE_DAY,
+              single_key=callback_url),
+          'delivery_domain_latency': DELIVERY_SAMPLER.get_chain(
+              DELIVERY_DOMAIN_SAMPLE_MINUTE_LATENCY,
+              DELIVERY_DOMAIN_SAMPLE_30_MINUTE_LATENCY,
+              DELIVERY_DOMAIN_SAMPLE_HOUR_LATENCY,
+              DELIVERY_DOMAIN_SAMPLE_DAY_LATENCY,
+              single_key=callback_url),
+        })

     self.response.out.write(template.render('event_details.html', context))

=======================================
--- /trunk/hub/topic_details.html       Fri Feb 26 11:54:31 2010
+++ /trunk/hub/topic_details.html       Mon Mar 15 23:00:57 2010
@@ -54,7 +54,7 @@
   </tr>
   <tr>
     <td>Fetch short-term:</td>
-    <td>{{fetch_errors|floatformat:"-2"}}% errors</td>
+    <td>{{fetch_errors|floatformat:"-2"}}% errors for domain</td>
   </tr>
 </table>

Reply via email to