You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
72 lines
2.4 KiB
72 lines
2.4 KiB
2 months ago
|
From d66084656bd01e22a5f23119968bd939d380875c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julien Rische <jrische@redhat.com>
|
||
|
|
Date: Mon, 18 Nov 2024 10:01:16 +0100
|
||
|
|
Subject: [PATCH] Use dedicated "kdcproxy" logger
|
||
|
|
|
||
|
|
Signed-off-by: Julien Rische <jrische@redhat.com>
|
||
|
|
(cherry picked from commit c8a69dbc0777579ba3bf3d156baed0966327ebc2)
|
||
|
|
---
|
||
|
|
kdcproxy/__init__.py | 7 +++++--
|
||
|
|
kdcproxy/config/__init__.py | 7 +++++--
|
||
|
|
2 files changed, 10 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kdcproxy/__init__.py b/kdcproxy/__init__.py
|
||
|
|
index cfec0f3..a84ad4a 100644
|
||
|
|
--- a/kdcproxy/__init__.py
|
||
|
|
+++ b/kdcproxy/__init__.py
|
||
|
|
@@ -37,6 +37,9 @@ else:
|
||
|
|
import httplib
|
||
|
|
import urlparse
|
||
|
|
|
||
|
|
+logging.basicConfig()
|
||
|
|
+logger = logging.getLogger('kdcproxy')
|
||
|
|
+
|
||
|
|
|
||
|
|
class HTTPException(Exception):
|
||
|
|
|
||
|
|
@@ -326,8 +329,8 @@ class Application:
|
||
|
|
fail_socktype = self.addr2socktypename(fail_addr)
|
||
|
|
fail_ip = fail_addr[4][0]
|
||
|
|
fail_port = fail_addr[4][1]
|
||
|
|
- logging.warning("Exchange with %s:[%s]:%d failed: %s",
|
||
|
|
- fail_socktype, fail_ip, fail_port, e)
|
||
|
|
+ logger.warning("Exchange with %s:[%s]:%d failed: %s",
|
||
|
|
+ fail_socktype, fail_ip, fail_port, e)
|
||
|
|
if reply is not None:
|
||
|
|
break
|
||
|
|
|
||
|
|
diff --git a/kdcproxy/config/__init__.py b/kdcproxy/config/__init__.py
|
||
|
|
index 5bff159..93af69a 100644
|
||
|
|
--- a/kdcproxy/config/__init__.py
|
||
|
|
+++ b/kdcproxy/config/__init__.py
|
||
|
|
@@ -32,6 +32,9 @@ except ImportError: # Python 2.x
|
||
|
|
import dns.rdatatype
|
||
|
|
import dns.resolver
|
||
|
|
|
||
|
|
+logging.basicConfig()
|
||
|
|
+logger = logging.getLogger('kdcproxy')
|
||
|
|
+
|
||
|
|
|
||
|
|
class IResolver(object):
|
||
|
|
|
||
|
|
@@ -60,14 +63,14 @@ class KDCProxyConfig(IConfig):
|
||
|
|
try:
|
||
|
|
self.__cp.read(filename)
|
||
|
|
except configparser.Error:
|
||
|
|
- logging.error("Unable to read config file: %s", filename)
|
||
|
|
+ logger.error("Unable to read config file: %s", filename)
|
||
|
|
|
||
|
|
try:
|
||
|
|
mod = self.__cp.get(self.GLOBAL, "configs")
|
||
|
|
try:
|
||
|
|
importlib.import_module("kdcproxy.config." + mod)
|
||
|
|
except ImportError as e:
|
||
|
|
- logging.log(logging.ERROR, "Error reading config: %s" % e)
|
||
|
|
+ logger.log(logging.ERROR, "Error reading config: %s" % e)
|
||
|
|
except configparser.Error:
|
||
|
|
pass
|
||
|
|
|
||
|
|
--
|
||
|
|
2.46.0
|
||
|
|
|