svc/connect.in: Fix latent type errors in info output.

[tripe] / svc / connect.in

diff --git a/svc/connect.in b/svc/connect.in
index 99dbd8a..aaf68de 100644 (file)
--- a/svc/connect.in
+++ b/svc/connect.in
@@ -451,7 +451,7 @@ class PingPeer (object):
         me._sabotage = False
       else:
         S.kill(me._peer)
-    except TripeError, e:
+    except T.TripeError, e:
       if e.args[0] == 'unknown-peer': me._pinger.kill(me._peer)
 
   def event(me, code, stuff):
@@ -510,23 +510,26 @@ class PingPeer (object):
 
   def info(me):
     if not me._nping:
-      mean = sd = '-'
+      mean = sd = min = max = '-'
     else:
-      mean = me._sigma_t/me._nping
-      sd = sqrt(me._sigma_t2/me._nping - mean*mean)
+      meanval = me._sigma_t/me._nping
+      mean = '%.1fms' % meanval
+      sd = '%.1fms' % sqrt(me._sigma_t2/me._nping - meanval*meanval)
+      min = '%.1fms' % me._min
+      max = '%.1fms' % me._max
     n = me._nping + me._nlost
     if not n: pclost = '-'
     else: pclost = '%d' % ((100*me._nlost + n//2)//n)
     return { 'last-ping': me._last,
-             'mean-ping': '%.1fms' % mean,
-             'sd-ping': '%.1fms' % sd,
+             'mean-ping': mean,
+             'sd-ping': sd,
              'n-ping': '%d' % me._nping,
              'n-lost': '%d' % me._nlost,
              'percent-lost': pclost,
-             'min-ping': '%.1fms' % me._min,
-             'max-ping': '%.1fms' % me._max,
+             'min-ping': min,
+             'max-ping': max,
              'state': me._timer and 'idle' or 'check',
-             'failures': me._failures }
+             'failures': str(me._failures) }
 
   @T._callback
   def _time(me):
@@ -842,7 +845,7 @@ def cmd_info(name):
   for i in items:
     try: v = d[i]
     except KeyError: v = peer.get(i)
-    T.svcinfo('%s=%s' % (i, v))
+    T.svcinfo('%s=%s' % (i, v.replace('\n', ' ')))
 
 def cmd_userpeer(user):
   """