Skip to content

Commit fd1e395

Browse files
authored
Ensure application logs show up in stdout (#443)
1 parent 4a98160 commit fd1e395

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

opwen_email_server/config.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
DNS_SECRET = env('LOKOLE_CLOUDFLARE_KEY', '')
4949
DNS_PROVIDER = env('LOKOLE_DNS_PROVIDER', 'CLOUDFLARE')
5050

51-
LOG_LEVEL = env('LOKOLE_LOG_LEVEL', 'INFO')
52-
53-
APPINSIGHTS_LOG_LEVEL = env('LOKOLE_EMAIL_SERVER_APPINSIGHTS_LOG_LEVEL', 'WARNING')
5451
APPINSIGHTS_KEY = env('LOKOLE_EMAIL_SERVER_APPINSIGHTS_KEY', '')
5552
APPINSIGHTS_HOST = env('LOKOLE_EMAIL_SERVER_APPINSIGHTS_HOST', '')
5653

opwen_email_server/constants/logging.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

opwen_email_server/utils/log.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
from logging import CRITICAL
22
from logging import DEBUG
33
from logging import INFO
4-
from logging import NOTSET
54
from logging import WARNING
6-
from logging import Formatter
7-
from logging import Handler
85
from logging import Logger
9-
from logging import StreamHandler
106
from logging import getLogger
117
from typing import Any
128
from typing import Iterable
@@ -17,15 +13,10 @@
1713
from applicationinsights.channel import AsynchronousSender
1814
from applicationinsights.channel import NullSender
1915
from applicationinsights.channel import TelemetryChannel
20-
from applicationinsights.logging import LoggingHandler
2116
from cached_property import cached_property
2217

2318
from opwen_email_server.config import APPINSIGHTS_HOST
2419
from opwen_email_server.config import APPINSIGHTS_KEY
25-
from opwen_email_server.config import APPINSIGHTS_LOG_LEVEL
26-
from opwen_email_server.config import LOG_LEVEL
27-
from opwen_email_server.constants.logging import APPINSIGHTS
28-
from opwen_email_server.constants.logging import STDERR
2920
from opwen_email_server.utils.collections import append
3021
from opwen_email_server.utils.collections import singleton
3122

@@ -41,30 +32,9 @@ class LogMixin:
4132
_telemetry_channel = _create_telemetry_channel()
4233
_telemetry_key = APPINSIGHTS_KEY or '00000000-0000-0000-0000-000000000000'
4334

44-
@cached_property
45-
def _default_log_handlers(self) -> Iterable[Handler]:
46-
handlers = []
47-
48-
stderr = StreamHandler()
49-
stderr.setFormatter(Formatter(STDERR))
50-
stderr.setLevel(LOG_LEVEL)
51-
handlers.append(stderr)
52-
53-
appinsights = LoggingHandler(self._telemetry_key, telemetry_channel=self._telemetry_channel)
54-
appinsights.setFormatter(Formatter(APPINSIGHTS))
55-
appinsights.setLevel(APPINSIGHTS_LOG_LEVEL)
56-
handlers.append(appinsights)
57-
58-
return handlers
59-
6035
@cached_property
6136
def _logger(self) -> Logger:
62-
log = getLogger(self.__class__.__name__)
63-
log.setLevel(NOTSET)
64-
log.propagate = False
65-
for handler in self._default_log_handlers:
66-
log.addHandler(handler)
67-
return log
37+
return getLogger('gunicorn.error')
6838

6939
@cached_property
7040
def _telemetry_client(self) -> TelemetryClient:

0 commit comments

Comments
 (0)