Added logging. Forgot to return anything; threads would blow up since test of is_ru...

[nodemanager.git] / accounts.py

diff --git a/accounts.py b/accounts.py
index 3074e41..cb41b67 100644 (file)
--- a/accounts.py
+++ b/accounts.py
@@ -81,7 +81,7 @@ class Account:
 
     def configure(self, rec):
         """Write <rec['keys']> to my authorized_keys file."""
-        logger.verbose('in accounts:configure')
+        logger.verbose('in accounts:configure for %s'%self.name)
         new_keys = rec['keys']
         if new_keys != self.keys:
             self.keys = new_keys
@@ -95,7 +95,7 @@ class Account:
 
     def start(self, delay=0): pass
     def stop(self): pass
-
+    def is_running(self): pass
 
 class Worker:
     # these semaphores are acquired before creating/destroying an account
@@ -128,7 +128,7 @@ class Worker:
             finally: self._create_sem.release()
         if not isinstance(self._acct, next_class): self._acct = next_class(rec)
         else: self._acct.configure(rec)
-        if startingup:
+        if startingup or not self.is_running():
             csd_lock.acquire()
             global cumstartdelay
             delay = cumstartdelay
@@ -147,6 +147,11 @@ class Worker:
     def stop(self): self._q.put((self._stop,))
     def _stop(self): self._acct.stop()
 
+    def is_running(self): 
+        status = self._acct.is_running()
+        if not status:  logger.verbose("Worker(%s): is not running" % self.name)
+        return status
+
     def _destroy(self, curr_class):
         self._acct = None
         if curr_class: