svc/watch.in: Rename some of the functions.

Functions which run commands are now called `run_...'.  The `addpeer'
and `delpeer' functions are now `adoptpeer' and `disownpeer', to make
way for like-named methods from `connect'.

diff --git a/svc/watch.in b/svc/watch.in
index 606d9cc6c31469c2c128fb82aed7e4e7b9306cf4..7bdda3652c81a5d9482fa70012efa717f59763ee 100644 (file)
--- a/svc/watch.in
+++ b/svc/watch.in
@@ -321,7 +321,7 @@ def boolean(value):
 ###--------------------------------------------------------------------------
 ### Waking up and watching peers.
 
-def connect(peer, cmd):
+def run_connect(peer, cmd):
   """
   Start the job of connecting to the passive PEER.
 
@@ -345,7 +345,7 @@ def connect(peer, cmd):
       q.get()
   potwatch('connect', peer.name, q)
 
-def disconnect(peer, cmd):
+def run_disconnect(peer, cmd):
   """
   Start the job of disconnecting from a passive PEER.
 
@@ -433,7 +433,7 @@ class PingPeer (object):
     if peer.has('connect'):
       S.warn('watch', 'reconnecting', me._peer)
       S.forcekx(me._peer)
-      T.spawn(connect, peer, peer.get('connect'))
+      T.spawn(run_connect, peer, peer.get('connect'))
       me._timer = M.SelTimer(time() + me._every, me._time)
     else:
       S.kill(me._peer)
@@ -574,7 +574,7 @@ class Pinger (T.Coroutine):
         if T._debug: print '# setting up peer %s' % name
         ifname = S.ifname(name)
         addr = S.addr(name)
-        T.defer(addpeer, peer, ifname, *addr)
+        T.defer(adoptpeer, peer, ifname, *addr)
       else:
         if T._debug: print '# adopting new peer %s' % name
         me.add(peer, True)
@@ -611,7 +611,7 @@ def envvars(peer):
   encode_envvars(env, 'A_', S.algs(peer.name))
   return env
 
-def ifupdown(what, peer, *args):
+def run_ifupdown(what, peer, *args):
   """
   Run the interface up/down script for a peer.
 
@@ -627,7 +627,7 @@ def ifupdown(what, peer, *args):
               envvars(peer))
   potwatch(what, peer.name, q)
 
-def addpeer(peer, ifname, *addr):
+def adoptpeer(peer, ifname, *addr):
   """
   Add a new peer to our collection.
 
@@ -638,25 +638,25 @@ def addpeer(peer, ifname, *addr):
   it's passive.
   """
   if peer.has('ifup'):
-    T.Coroutine(ifupdown, name = 'ifup %s' % peer.name) \
+    T.Coroutine(run_ifupdown, name = 'ifup %s' % peer.name) \
         .switch('ifup', peer, ifname, *addr)
   cmd = peer.get('connect', default = None)
   if cmd is not None:
-    T.Coroutine(connect, name = 'connect %s' % peer.name) \
+    T.Coroutine(run_connect, name = 'connect %s' % peer.name) \
         .switch(peer, cmd)
   if peer.get('watch', filter = boolean, default = False):
     pinger.add(peer, False)
 
-def delpeer(peer):
+def disownpeer(peer):
   """Drop the PEER from the Pinger and put its interface to bed."""
   try: pinger.kill(peer)
   except KeyError: pass
   cmd = peer.get('disconnect', default = None)
   if cmd is not None:
-    T.Coroutine(disconnect, name = 'disconnect %s' % peer.name) \
+    T.Coroutine(run_disconnect, name = 'disconnect %s' % peer.name) \
         .switch(peer, cmd)
   if peer.has('ifdown'):
-    T.Coroutine(ifupdown, name = 'ifdown %s' % peer.name) \
+    T.Coroutine(run_ifupdown, name = 'ifdown %s' % peer.name) \
         .switch('ifdown', peer)
 
 def notify(_, code, *rest):
@@ -669,11 +669,11 @@ def notify(_, code, *rest):
   if code == 'ADD':
     try: p = Peer(rest[0])
     except KeyError: return
-    addpeer(p, *rest[1:])
+    adoptpeer(p, *rest[1:])
   elif code == 'KILL':
     try: p = Peer(rest[0])
     except KeyError: return
-    delpeer(p, *rest[1:])
+    disownpeer(p, *rest[1:])
 
 ###--------------------------------------------------------------------------
 ### Command stubs.