From 169f3ebe5b8a94978e3e3547460d009c74eca789 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 19 Oct 2020 18:52:17 +0200 Subject: [PATCH] outposts: fix logger again --- passbook/outposts/controllers/base.py | 6 ++---- passbook/outposts/controllers/k8s/base.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/passbook/outposts/controllers/base.py b/passbook/outposts/controllers/base.py index 21cb952f8..ef47b5c80 100644 --- a/passbook/outposts/controllers/base.py +++ b/passbook/outposts/controllers/base.py @@ -1,7 +1,7 @@ """Base Controller""" from typing import Dict, List -from structlog import get_logger, wrap_logger +from structlog import get_logger from structlog.testing import capture_logs from passbook.lib.sentry import SentryIgnoredException @@ -21,9 +21,7 @@ class BaseController: def __init__(self, outpost: Outpost): self.outpost = outpost - self.logger = wrap_logger( - get_logger(), controller=self.__class__.__name__, outpost=self.outpost - ) + self.logger = get_logger() self.deployment_ports = {} # pylint: disable=invalid-name diff --git a/passbook/outposts/controllers/k8s/base.py b/passbook/outposts/controllers/k8s/base.py index bb960800c..d4b6265b4 100644 --- a/passbook/outposts/controllers/k8s/base.py +++ b/passbook/outposts/controllers/k8s/base.py @@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Generic, TypeVar from kubernetes.client import V1ObjectMeta from kubernetes.client.rest import ApiException -from structlog import get_logger, wrap_logger +from structlog import get_logger from passbook import __version__ from passbook.lib.sentry import SentryIgnoredException @@ -35,9 +35,7 @@ class KubernetesObjectReconciler(Generic[T]): def __init__(self, controller: "KubernetesController"): self.controller = controller self.namespace = controller.outpost.config.kubernetes_namespace - self.logger = wrap_logger( - get_logger(), controller=self.__class__.__name__, outpost=controller.outpost - ) + self.logger = get_logger() @property def name(self) -> str: