self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-07-07 00:56:11 +02:00
Code Issues Releases Activity

Merge #3235

Browse Source 
3235: Tweaks to logging r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Make the default ``LOG_LEVEL=INFO`` ; ensure that admin does not log the access log unless it's set to ``DEBUG``
This ensures we see the authentication related messages.

### Related issue(s)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
bors-mailu[bot]
2024-05-10 11:16:50 +00:00
committed by GitHub
parent c728fa88e4 1d8f041b87
commit 935266bc65
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/admin/mailu/__init__.py
View File

@ -11,7 +11,14 @@ import logging
import hmac import hmac
class NoPingFilter(logging.Filter): class NoPingFilter(logging.Filter):
skipAccessLogs = False
def __init__(self, filterAccessLogs=False):
self.skipAccessLogs = filterAccessLogs
def filter(self, record): def filter(self, record):
if self.skipAccessLogs and record.args['r'].endswith(' HTTP/1.1'):
return False
if record.args['r'].endswith(' /ping HTTP/1.1'): if record.args['r'].endswith(' /ping HTTP/1.1'):
return False return False
if record.args['r'].endswith(' /internal/rspamd/local_domains HTTP/1.1'): if record.args['r'].endswith(' /internal/rspamd/local_domains HTTP/1.1'):
@ -24,7 +31,7 @@ class Logger(glogging.Logger):
# Add filters to Gunicorn logger # Add filters to Gunicorn logger
logger = logging.getLogger("gunicorn.access") logger = logging.getLogger("gunicorn.access")
logger.addFilter(NoPingFilter()) logger.addFilter(NoPingFilter(logger.getEffectiveLevel()>logging.DEBUG))
def create_app_from_config(config): def create_app_from_config(config):
""" Create a new application based on the given configuration """ Create a new application based on the given configuration

2
setup/flavors/compose/mailu.env
View File

@ -178,7 +178,7 @@ REAL_IP_FROM={{ real_ip_from }}
REJECT_UNLISTED_RECIPIENT={{ reject_unlisted_recipient }} REJECT_UNLISTED_RECIPIENT={{ reject_unlisted_recipient }}
# Log level threshold in start.py (value: CRITICAL, ERROR, WARNING, INFO, DEBUG, NOTSET) # Log level threshold in start.py (value: CRITICAL, ERROR, WARNING, INFO, DEBUG, NOTSET)
LOG_LEVEL=WARNING LOG_LEVEL=INFO
# Timezone for the Mailu containers. See this link for all possible values https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # Timezone for the Mailu containers. See this link for all possible values https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
TZ=Etc/UTC TZ=Etc/UTC