From 16bc823a4fdb3c2f0af6919d446a5c62825839a3 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 25 May 2018 10:23:06 +0200
Subject: [PATCH] fix in logging: actually store importer logs in /var/log

---
 sfa/client/sfaadmin.py   |  3 +++
 sfa/importer/__init__.py | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index ca8e2bee..4cc3e8ce 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
@@ -317,6 +319,7 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"
 
     def import_registry(self):
         """Run the importer"""
+        init_logger('import')
         from sfa.importer import Importer
         importer = Importer()
         importer.run()
diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
index f254713e..46a69f10 100644
--- a/sfa/importer/__init__.py
+++ b/sfa/importer/__init__.py
@@ -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 logger as import_logger
+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,10 +31,12 @@ 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 = import_logger
+            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
-- 
2.43.0