shebangs need to point at python2

[sfa.git] / sfa / importer / __init__.py

diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
index 84513e2..90e15e4 100644 (file)
--- a/sfa/importer/__init__.py
+++ b/sfa/importer/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # pylint: disable=c0111, w1201, w0622
 
@@ -7,7 +7,7 @@ from datetime import datetime
 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.generic import Generic
 from sfa.util.config import Config
-from sfa.util.sfalogging import _SfaLogger
+from sfa.util.sfalogging import init_logger, logger as default_logger
 from sfa.trust.hierarchy import Hierarchy
 # from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.gid import create_uuid
@@ -16,6 +16,12 @@ from sfa.trust.gid import create_uuid
 from sfa.storage.alchemy import global_dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegUser
 
+# note on logging
+# it is doubtful that anyone ever used the ability to
+# pass a logger to this class, and that can probably be
+# thrown away.
+# However a quick attempt showed that it seems to
+# also require changes in the Generic layer
 
 class Importer:
 
@@ -25,12 +31,13 @@ class Importer:
             self.auth_hierarchy = auth_hierarchy
         else:
             self.auth_hierarchy = Hierarchy()
-        if logger is not None:
-            self.logger = logger
+        if logger is None:
+            # redirect in sfa-import.log
+            self.logger = default_logger
+            init_logger('import')
         else:
-            self.logger = _SfaLogger(
-                logfile='/var/log/sfa_import.log', loggername='importlog')
-            self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL)
+            self.logger = logger
+        self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL)
 # ugly side effect so that other modules get it right
         import sfa.util.sfalogging
         sfa.util.sfalogging.logger = logger
@@ -67,27 +74,6 @@ class Importer:
             self.logger.info(
                 "SfaImporter: imported authority (parent) %s " % auth_record)
 
-    def create_sm_client_record(self):
-        """
-        Create a user record for the Slicemanager service.
-        """
-        hrn = self.interface_hrn + '.slicemanager'      # pylint: disable=e1101
-        urn = hrn_to_urn(hrn, 'user')
-        if not self.auth_hierarchy.auth_exists(urn):
-            self.logger.info("SfaImporter: creating Slice Manager user")
-            self.auth_hierarchy.create_auth(urn)
-
-        if self.record_exists('user', hrn):
-            return
-        auth_info = self.auth_hierarchy.get_auth_info(hrn)
-        user_record = RegUser(hrn=hrn, gid=auth_info.get_gid_object(),
-                              authority=get_authority(hrn))
-        user_record.just_created()
-        global_dbsession.add(user_record)
-        global_dbsession.commit()
-        self.logger.info(
-            "SfaImporter: importing user (slicemanager) %s " % user_record)
-
     def create_interface_records(self):
         """
         Create a record for each SFA interface