Improved wrapped logging #187

src/cpl-auth/cpl/auth/__init__.py

@@ -6,7 +6,7 @@ from cpl.auth import permission as _permission
 from cpl.auth.keycloak.keycloak_admin import KeycloakAdmin as _KeycloakAdmin
 from cpl.auth.keycloak.keycloak_client import KeycloakClient as _KeycloakClient
 from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
-from .auth_logger import AuthLogger
+from .logger import AuthLogger
 from .keycloak_settings import KeycloakSettings
 from .permission_seeder import PermissionSeeder
 

src/cpl-auth/cpl/auth/auth_logger.py

@@ -1,8 +0,0 @@
-from cpl.core.log import LoggerABC
-from cpl.core.log.wrapped_logger import WrappedLogger
-
-
-class AuthLogger(WrappedLogger):
-
-    def __init__(self, logger: LoggerABC):
-        WrappedLogger.__init__(self, logger)

src/cpl-auth/cpl/auth/keycloak/keycloak_admin.py

@@ -1,13 +1,13 @@
 from keycloak import KeycloakAdmin as _KeycloakAdmin, KeycloakOpenIDConnection
 
-from cpl.auth.auth_logger import AuthLogger
 from cpl.auth.keycloak_settings import KeycloakSettings
+from cpl.auth.logger import AuthLogger
 
 
 class KeycloakAdmin(_KeycloakAdmin):
 
     def __init__(self, logger: AuthLogger, settings: KeycloakSettings):
-        logger.info("Initializing Keycloak admin")
+        # logger.info("Initializing Keycloak admin")
         _connection = KeycloakOpenIDConnection(
             server_url=settings.url,
             client_id=settings.client_id,

src/cpl-auth/cpl/auth/keycloak/keycloak_client.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 from keycloak import KeycloakOpenID
 
-from cpl.auth.auth_logger import AuthLogger
+from cpl.auth.logger import AuthLogger
 from cpl.auth.keycloak_settings import KeycloakSettings
 
 

src/cpl-auth/cpl/auth/logger.py

@@ -0,0 +1,7 @@
+from cpl.core.log.wrapped_logger import WrappedLogger
+
+
+class AuthLogger(WrappedLogger):
+
+    def __init__(self):
+        WrappedLogger.__init__(self, "auth")

src/cpl-auth/cpl/auth/permission_seeder.py

@@ -14,7 +14,7 @@ from cpl.auth.schema import (
 )
 from cpl.core.utils.get_value import get_value
 from cpl.database.abc.data_seeder_abc import DataSeederABC
-from cpl.database.db_logger import DBLogger
+from cpl.database.logger import DBLogger
 
 
 class PermissionSeeder(DataSeederABC):

src/cpl-auth/cpl/auth/schema/_administration/auth_user.py

@@ -9,7 +9,7 @@ from cpl.auth.keycloak import KeycloakAdmin
 from cpl.auth.permission.permissions import Permissions
 from cpl.core.typing import SerialId
 from cpl.database.abc import DbModelABC
-from cpl.database.db_logger import DBLogger
+from cpl.database.logger import DBLogger
 from cpl.dependency import ServiceProviderABC
 
 
@@ -36,8 +36,8 @@ class AuthUser(DbModelABC):
             return "ANONYMOUS"
 
         try:
-            keycloak_admin: KeycloakAdmin = ServiceProviderABC.get_global_service(KeycloakAdmin)
-            return keycloak_admin.get_user(self._keycloak_id).get("username")
+            keycloak = ServiceProviderABC.get_global_service(KeycloakAdmin)
+            return keycloak.get_user(self._keycloak_id).get("username")
         except KeycloakGetError as e:
             return "UNKNOWN"
         except Exception as e:
@@ -51,8 +51,8 @@ class AuthUser(DbModelABC):
             return "ANONYMOUS"
 
         try:
-            keycloak_admin: KeycloakAdmin = ServiceProviderABC.get_global_service(KeycloakAdmin)
-            return keycloak_admin.get_user(self._keycloak_id).get("email")
+            keycloak = ServiceProviderABC.get_global_service(KeycloakAdmin)
+            return keycloak.get_user(self._keycloak_id).get("email")
         except KeycloakGetError as e:
             return "UNKNOWN"
         except Exception as e: