chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Better diagnostics for coroutines.
[tripe]
/
svc
/
watch.in
diff --git
a/svc/watch.in
b/svc/watch.in
index bc904bd904582cc5d12e72f308c263a5ea405ffd..e058ed8e7db17fa98d4c2b098c239ec73d980389 100644
(file)
--- a/
svc/watch.in
+++ b/
svc/watch.in
@@
-614,9
+614,11
@@
def addpeer(info, peer, ifname, *addr):
except KeyError:
return
if 'ifup' in info:
except KeyError:
return
if 'ifup' in info:
- T.Coroutine(ifupdown).switch('ifup', peer, info, ifname, *addr)
+ T.Coroutine(ifupdown, name = 'ifup %s' % peer) \
+ .switch('ifup', peer, info, ifname, *addr)
if 'connect' in info:
if 'connect' in info:
- T.Coroutine(connect).switch(peer, info['connect'])
+ T.Coroutine(connect, name = 'connect %s' % peer) \
+ .switch(peer, info['connect'])
if boolean(info, 'watch', False):
pinger.add(peer, info, False)
if boolean(info, 'watch', False):
pinger.add(peer, info, False)
@@
-631,7
+633,8
@@
def delpeer(peer):
except KeyError:
pass
if 'ifdown' in info:
except KeyError:
pass
if 'ifdown' in info:
- T.Coroutine(ifupdown).switch('ifdown', peer, info)
+ T.Coroutine(ifupdown, name = 'ifdown %s' % peer) \
+ .switch('ifdown', peer, info)
def notify(_, code, *rest):
"""
def notify(_, code, *rest):
"""
@@
-687,7
+690,7
@@
def init():
errorwatch = ErrorWatch()
childwatch = ChildWatch()
pinger = Pinger()
errorwatch = ErrorWatch()
childwatch = ChildWatch()
pinger = Pinger()
- T.Coroutine(dbwatch).switch()
+ T.Coroutine(dbwatch
, name = 'dbwatch'
).switch()
errorwatch.switch()
pinger.switch()
errorwatch.switch()
pinger.switch()