import Queue
import os
import pwd
+from grp import getgrnam
import threading
import logger
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
dot_ssh = '/home/%s/.ssh' % self.name
- def do_installation():
- 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.verbose('%s: installing ssh keys' % self.name)
- tools.fork_as(self.name, do_installation)
+ 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)
+ user = pwd.getpwnam(self.name)[2]
+ group = getgrnam("slices")[2]
+ os.chown(dot_ssh, user, group)
+ os.chown(dot_ssh + '/authorized_keys', user, group)
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
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
def stop(self): self._q.put((self._stop,))
def _stop(self): self._acct.stop()
+ def is_running(self):
+ if self._acct.is_running():
+ status = True
+ else:
+ status = False
+ logger.verbose("Worker(%s): is not running" % self.name)
+ return status
+
def _destroy(self, curr_class):
self._acct = None
if curr_class: