svc/watch.in: Fix startup scan to initialize unwatched connections.

[tripe] / svc / watch.in

diff --git a/svc/watch.in b/svc/watch.in
index 97a12bf..140f1fc 100644 (file)
--- a/svc/watch.in
+++ b/svc/watch.in
@@ -527,6 +527,7 @@ class Pinger (T.Coroutine):
     """
     if T._debug: print '# rescan peers'
     correct = {}
+    start = {}
     for peer in S.list():
       try:
         info = peerinfo(peer)
@@ -534,14 +535,17 @@ class Pinger (T.Coroutine):
         continue
       if boolean(info, 'watch', False):
         if T._debug: print '# interesting peer %s' % peer
-        correct[peer] = info
+        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