server/admin.c (a_vformat): Fix uses of `va_arg' to dereference `ap'.

[tripe] / svc / connect.in

diff --git a/svc/connect.in b/svc/connect.in
index 000ca50eba511232b1ae82dd3d7af613b1b33797..047139678a9904ef805ebb1b75e764693233701f 100644 (file)
--- a/svc/connect.in
+++ b/svc/connect.in
@@ -127,7 +127,7 @@ class ErrorWatch (T.Coroutine):
 
 def dbwatch():
   """
-  Coroutine function: wake up every second and notice changes to the
+  Coroutine function: wake up every minute and notice changes to the
   database.  When a change happens, tell the Pinger (q.v.) to rescan its
   peers.
   """
@@ -135,7 +135,7 @@ def dbwatch():
   main = cr.parent
   fw = M.FWatch(opts.cdb)
   while True:
-    timer = M.SelTimer(time() + 1, lambda: cr.switch())
+    timer = M.SelTimer(time() + 60, lambda: cr.switch())
     main.switch()
     if fw.update():
       pinger.rescan(False)
@@ -716,7 +716,7 @@ def cmd_kick(name):
     raise T.TripeJobError('peer-not-adopted', name)
   try: peer = Peer(name)
   except KeyError: raise T.TripeJobError('unknown-peer', name)
-  T.spawn(connect, peer)
+  T.spawn(run_connect, peer, peer.get('connect'))
 
 def cmd_adopted():
   """