add logging, fix small issues

Author: gerbyzation

casbin_adapter/enforcer.py

@@ -1,3 +1,4 @@
+import logging
 from django.conf import settings
 from django.db import connection
 from django.db.utils import OperationalError, ProgrammingError
@@ -7,6 +8,8 @@
 from .adapter import Adapter
 from .utils import import_class
 
+logger = logging.getLogger(__name__)
+
 
 
 class ProxyEnforcer(Enforcer):
@@ -15,18 +18,22 @@ class ProxyEnforcer(Enforcer):
     def __init__(self, *args, **kwargs):
         if self._initialized:
             super().__init__(*args, **kwargs)
+        else:
+            logger.info('Deferring casbin enforcer initialisation until django is ready')
 
     def _load(self):
         if self._initialized == False:
+            logger.info('Performing deferred casbin enforcer initialisation')
             self._initialized = True
             model = getattr(settings, 'CASBIN_MODEL')
             enable_log = getattr(settings, 'CASBIN_LOG_ENABLED', False)
             adapter_loc = getattr(settings, 'CASBIN_ADAPTER', 'casbin_adapter.adapter.Adapter')
             adapter_args = getattr(settings, 'CASBIN_ADAPTER_ARGS', tuple())
             Adapter = import_class(adapter_loc)
-            adapter = adapter_class(*adapter_args)
+            adapter = Adapter(*adapter_args)
 
             super().__init__(model, adapter, enable_log)
+            logger.debug('Casbin enforcer initialised')
 
             watcher = getattr(settings, 'CASBIN_WATCHER', None)
             if watcher:

casbin_adapter/utils.py

@@ -4,7 +4,7 @@ def import_class(name):
     """Import class from string
     e.g. `package.module.ClassToImport` returns the `ClasToImport` class"""
     components = name.split('.')
-    module_name = components[:-1].join('.')
+    module_name = '.'.join(components[:-1])
     class_name = components[-1]
     module = importlib.import_module(module_name)
     class_ = getattr(module, class_name)