X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfaadmin.py;h=95e139f7966df29ceb8e6d7d85a05ae25400559a;hb=713d58df0baa1f9739eec9bfa30ceb41d7149e23;hp=d67734ed8c93a0d64f62a45a6bd5c3231c0166e0;hpb=7eb34251548a271ae964b2f7d7e0fad7a1e41f5a;p=sfa.git

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index d67734ed..95e139f7 100755
--- a/sfa/client/sfaadmin.py
+++ b/sfa/client/sfaadmin.py
@@ -12,6 +12,8 @@ from optparse import OptionParser
 
 from sfa.generic import Generic
 from sfa.util.xrn import Xrn
+from sfa.util.sfalogging import logger, init_logger
+
 from sfa.storage.record import Record
 
 from sfa.trust.hierarchy import Hierarchy
@@ -26,6 +28,9 @@ from sfa.client.sfi import save_records_to_file
 
 pprinter = PrettyPrinter(indent=4)
 
+# if set, will output on stdout
+DEBUG = False
+
 try:
     help_basedir = Hierarchy().basedir
 except Exception:
@@ -317,6 +322,8 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"
 
     def import_registry(self):
         """Run the importer"""
+        if not DEBUG:
+            init_logger('import')
         from sfa.importer import Importer
         importer = Importer()
         importer.run()
@@ -347,9 +354,8 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"
         filesystem cleanups optionally
         """
         from sfa.storage.dbschema import DBSchema
-        from sfa.util.sfalogging import _SfaLogger
-        logger = _SfaLogger(
-            logfile='/var/log/sfa_import.log', loggername='importlog')
+        from sfa.util.sfalogging import init_logger, logger
+        init_logger('import')
         logger.setLevelFromOptVerbose(self.api.config.SFA_API_LOGLEVEL)
         logger.info("Purging SFA records from database")
         dbschema = DBSchema()
@@ -498,18 +504,13 @@ class AggregateCommands(Commands):
         self.api.manager.Delete(self.api, [xrn], [], {})
 
 
-class SliceManagerCommands(AggregateCommands):
-
-    def __init__(self, *args, **kwds):
-        self.api = Generic.the_flavour().make_api(interface='slicemgr')
-
-
 class SfaAdmin:
 
-    CATEGORIES = {'certificate': CertCommands,
-                  'registry': RegistryCommands,
-                  'aggregate': AggregateCommands,
-                  'slicemgr': SliceManagerCommands}
+    CATEGORIES = {
+        'certificate': CertCommands,
+        'registry': RegistryCommands,
+        'aggregate': AggregateCommands,
+       }
 
     # returns (name,class) or (None,None)
     def find_category(self, input):