Merge branch 'mdw/multi-priv'

[tripe] / svc / watch.in

diff --git a/svc/watch.in b/svc/watch.in
index e058ed8..5917c79 100644 (file)
--- a/svc/watch.in
+++ b/svc/watch.in
@@ -525,26 +525,35 @@ class Pinger (T.Coroutine):
     installed, and again by the dbwatcher coroutine when it detects a change
     to the database.
     """
+    if T._debug: print '# rescan peers'
     correct = {}
+    start = {}
     for peer in S.list():
       try:
         info = peerinfo(peer)
       except KeyError:
         continue
       if boolean(info, 'watch', False):
-        correct[peer] = info
+        if T._debug: print '# interesting peer %s' % peer
+        correct[peer] = start[peer] = info
+      elif startup:
+        if T._debug: print '# peer %s ready for adoption' % peer
+        start[peer] = info
     for peer, obj in me._peers.items():
       if peer in correct:
         obj.update(correct[peer])
       else:
+        if T._debug: print '# peer %s vanished' % peer
         del me._peers[peer]
-    for peer, info in correct.iteritems():
+    for peer, info in start.iteritems():
       if peer not in me._peers:
         if startup:
+          if T._debug: print '# setting up peer %s' % peer
           ifname = S.ifname(peer)
           addr = S.addr(peer)
           T.defer(addpeer, info, peer, ifname, *addr)
         else:
+          if T._debug: print '# adopting new peer %s' % peer
           me.add(peer, info, True)
     return me
 
@@ -568,15 +577,15 @@ def encode_envvars(env, prefix, vars):
     env[prefix + r_bad.sub('_', k.upper())] = v
 
 r_bad = RX.compile(r'[\W_]+')
-def envvars(info):
+def envvars(peer, info):
   """
-  Translate the database INFO dictionary for a peer into a dictionary of
+  Translate the database INFO dictionary for a PEER into a dictionary of
   environment variables with plausible upper-case names and a P_ prefix.
   Also collect the crypto information into A_ variables.
   """
   env = {}
   encode_envvars(env, 'P_', info)
-  encode_envvars(env, 'A_', S.algs())
+  encode_envvars(env, 'A_', S.algs(peer))
   return env
 
 def ifupdown(what, peer, info, *args):
@@ -593,7 +602,7 @@ def ifupdown(what, peer, info, *args):
   c = Command([what, peer], q, what,
               M.split(info[what], quotep = True)[0] +
               [peer] + list(args),
-              envvars(info))
+              envvars(peer, info))
   potwatch(what, peer, q)
 
 def addpeer(info, peer, ifname, *addr):