class Account:
def __init__(self, rec):
+ logger.verbose('Initing account %s'%rec['name'])
self.name = rec['name']
self.keys = ''
self.initscriptchanged = False
def configure(self, rec):
"""Write <rec['keys']> to my authorized_keys file."""
+ logger.verbose('in accounts:configure for %s'%self.name)
new_keys = rec['keys']
if new_keys != self.keys:
self.keys = new_keys
if not os.access(dot_ssh, os.F_OK): os.mkdir(dot_ssh)
os.chmod(dot_ssh, 0700)
tools.write_file(dot_ssh + '/authorized_keys', lambda f: f.write(new_keys))
- logger.log('%s: installing ssh keys' % self.name)
+ logger.verbose('%s: installing ssh keys' % self.name)
tools.fork_as(self.name, do_installation)
def start(self, delay=0): pass
def ensure_created(self, rec):
"""Cause the account specified by <rec> to exist if it doesn't already."""
+ if rec.has_key('name'):
+ logger.verbose('Worker.ensure_created with name=%s'%rec['name'])
self._q.put((self._ensure_created, rec.copy(), Startingup))
+ logger.verbose('Worker queue has %d item(s)'%self._q.qsize())
def _ensure_created(self, rec, startingup):
curr_class = self._get_class()
def _ensure_destroyed(self): self._destroy(self._get_class())
def start(self, delay=0): self._q.put((self._start, delay))
- def _start(self, d):
- try: self._acct.start(delay=d)
- except: logger.log_exc()
+ def _start(self, d): self._acct.start(delay=d)
def stop(self): self._q.put((self._stop,))
def _stop(self): self._acct.stop()
"""Repeatedly pull commands off the queue and execute. If memory usage becomes an issue, it might be wise to terminate after a while."""
while True:
try:
+ logger.verbose('Worker:_run : getting - size is %d'%self._q.qsize())
cmd = self._q.get()
cmd[0](*cmd[1:])
except:
- logger.log("Thread for %s died." % self.name)
- logger.log_exc()
+ logger.log_exc(self.name)