~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc/connect.in: Use the service's version, not the TrIPE library version.
[tripe]
/
svc
/
connect.in
diff --git
a/svc/connect.in
b/svc/connect.in
index
268ad5f
..
9dda65b
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)
me._sabotage = False
else:
S.kill(me._peer)
- except TripeError, e:
+ except T
.T
ripeError, e:
if e.args[0] == 'unknown-peer': me._pinger.kill(me._peer)
def event(me, code, stuff):
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:
def info(me):
if not me._nping:
- mean = sd = '-'
+ mean = sd =
min = max =
'-'
else:
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,
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,
'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',
'state': me._timer and 'idle' or 'check',
- 'failures':
me._failures
}
+ 'failures':
str(me._failures)
}
@T._callback
def _time(me):
@T._callback
def _time(me):
@@
-966,7
+969,7
@@
def parse_options():
return opts
## Service table, for running manually.
return opts
## Service table, for running manually.
-service_info = [('connect',
T.
VERSION, {
+service_info = [('connect', VERSION, {
'adopted': (0, 0, '', cmd_adopted),
'kick': (1, 1, 'PEER', cmd_kick),
'passive': (1, None, '[OPTIONS] USER', cmd_passive),
'adopted': (0, 0, '', cmd_adopted),
'kick': (1, 1, 'PEER', cmd_kick),
'passive': (1, None, '[OPTIONS] USER', cmd_passive),