avoid using logger.log_exc_critical (will go away) and logger.warn (obsolete)

diff --git a/sfa/generic/__init__.py b/sfa/generic/__init__.py
index bd37cf4..2f7137f 100644 (file)
--- a/sfa/generic/__init__.py
+++ b/sfa/generic/__init__.py
@@ -102,8 +102,9 @@ class Generic:
             # or use the module as is if it's a module
             # so bottom line is, don't try the constructor here
             return module_or_class
-        except:
-            logger.log_exc_critical(message)
+        except Exception:
+            logger.log_exc(message)
+            exit(1)
 
     # need interface to select the right driver
     def make_driver(self, api):
@@ -121,5 +122,6 @@ class Generic:
             class_obj = getattr(self, classname)()
             logger.debug("%s : %s" % (message, class_obj))
             return class_obj(api)
-        except:
-            logger.log_exc_critical(message)
+        except Exception:
+            logger.log_exc(message)
+            exit(1)

diff --git a/sfa/importer/nitosimporter.py b/sfa/importer/nitosimporter.py
index f77abd4..aa7a978 100644 (file)
--- a/sfa/importer/nitosimporter.py
+++ b/sfa/importer/nitosimporter.py
@@ -233,13 +233,13 @@ class NitosImporter:
                             except:
                                 continue
                         if not pkey:
-                            self.logger.warn(
+                            self.logger.warning(
                                 'NitosImporter: unable to convert public key for %s' % user_hrn)
                             pkey = Keypair(create=True)
                     else:
                         # the user has no keys. Creating a random keypair for
                         # the user's gid
-                        self.logger.warn(
+                        self.logger.warning(
                             "NitosImporter: user %s does not have a NITOS public key" % user_hrn)
                         pkey = Keypair(create=True)
                     return (pubkey, pkey)

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 7ca1af5..235e4bb 100755 (executable)
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -243,5 +243,6 @@ def main():
 if __name__ == "__main__":
     try:
         main()
-    except:
-        logger.log_exc_critical("SFA server is exiting")
+    except Exception:
+        logger.log_exc("SFA server is exiting")
+        exit(1)