X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=accounts.py;h=f07cb19c0498ff5938c0243432967e4ea85ae455;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=df339770d41d1a23266bbf0a35dbc8949ae57b58;hpb=425cb14b866202fdbe2011e1d255b458d38bd167;p=nodemanager.git

diff --git a/accounts.py b/accounts.py
index df33977..f07cb19 100644
--- a/accounts.py
+++ b/accounts.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """Functionality common to all account classes.
 
 Each subclass of Account must provide five methods: create() and
@@ -69,7 +72,7 @@ def get(name):
 
 class Account:
     def __init__(self, rec):
-        logger.verbose('Initing account %s'%rec['name'])
+        logger.verbose('accounts: Initing account %s'%rec['name'])
         self.name = rec['name']
         self.keys = ''
         self.initscriptchanged = False
@@ -82,7 +85,7 @@ class Account:
 
     def configure(self, rec):
         """Write <rec['keys']> to my authorized_keys file."""
-        logger.verbose('%s: in accounts:configure'%self.name)
+        logger.verbose('accounts: configuring %s'%self.name)
         new_keys = rec['keys']
         if new_keys != self.keys:
             # get the unix account info
@@ -96,7 +99,7 @@ class Account:
             dot_ssh = os.path.join(pw_dir,'.ssh')
             if not os.path.isdir(dot_ssh):
                 if not os.path.isdir(pw_dir):
-                    logger.verbose('WARNING: homedir %s does not exist for %s!'%(pw_dir,self.name))
+                    logger.verbose('accounts: WARNING: homedir %s does not exist for %s!'%(pw_dir,self.name))
                     os.mkdir(pw_dir)
                     os.chown(pw_dir, uid, gid)
                 os.mkdir(dot_ssh)
@@ -113,7 +116,7 @@ class Account:
             # set self.keys to new_keys only when all of the above ops succeed
             self.keys = new_keys
 
-            logger.log('%s: installed ssh keys' % self.name)
+            logger.log('accounts: %s: installed ssh keys' % self.name)
 
     def start(self, delay=0): pass
     def stop(self): pass
@@ -155,7 +158,7 @@ class Worker:
             status = True
         else:
             status = False
-            logger.verbose("Worker(%s): is not running" % self.name)
+            logger.verbose("accounts: Worker(%s): is not running" % self.name)
         return status
 
     def _destroy(self, curr_class):