Commit c3cec3e1 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Simplify logging configuration

Checking SLAPOS_TEST_DEBUG in the test itself came from ancient history of the
testcase, it's time to drop it and use modern apporach.
parent 65389794
...@@ -109,13 +109,6 @@ def new_getaddrinfo(*args): ...@@ -109,13 +109,6 @@ def new_getaddrinfo(*args):
return DNS_CACHE[args[:2]] return DNS_CACHE[args[:2]]
# for development: debugging logs and install Ctrl+C handler
if os.environ.get('SLAPOS_TEST_DEBUG'):
logging.basicConfig(level=logging.DEBUG)
import unittest
unittest.installHandler()
def der2pem(der): def der2pem(der):
certificate = x509.load_der_x509_certificate(der, default_backend()) certificate = x509.load_der_x509_certificate(der, default_backend())
return certificate.public_bytes(serialization.Encoding.PEM) return certificate.public_bytes(serialization.Encoding.PEM)
...@@ -561,11 +554,7 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -561,11 +554,7 @@ class TestHandler(BaseHTTPRequestHandler):
server_version = "TestBackend" server_version = "TestBackend"
sys_version = "" sys_version = ""
def log_message(self, *args): log_message = logging.getLogger(__name__ + '.TestHandler').info
if os.environ.get('SLAPOS_TEST_DEBUG'):
return BaseHTTPRequestHandler.log_message(self, *args)
else:
return
def do_DELETE(self): def do_DELETE(self):
config = self.configuration.pop(self.path, None) config = self.configuration.pop(self.path, None)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment