diff --git a/doc/upgrade.rst b/doc/upgrade.rst index 4e649796d..113a9de01 100644 --- a/doc/upgrade.rst +++ b/doc/upgrade.rst @@ -130,6 +130,36 @@ Rebuild Virtual Environment Specific instructions ********************* +Version 2.6.1 +============= + +Required changes to :file:`settings.py` +--------------------------------------- + +- Add the following lines to ``LOGGING`` variable: + + .. sourcecode:: python + + 'handlers': { + ... + 'syslog': { + 'class': 'logging.handlers.SysLogHandler', + 'facility': SysLogHandler.LOG_SYSLOG, + 'formatter': 'syslog' + }, + ... + }, + 'loggers': { + ... + 'modoboa.dns': { + 'handlers': ['syslog'], + 'level': 'INFO', + 'propagate': False + }, + ... + } + + Version 2.6.0 ============= diff --git a/modoboa/admin/lib.py b/modoboa/admin/lib.py index 72c611895..8b5faba2e 100644 --- a/modoboa/admin/lib.py +++ b/modoboa/admin/lib.py @@ -213,7 +213,7 @@ def get_authoritative_resolver(domain, resolver=None): def get_dns_records(name, typ, resolver=None): """Retrieve DNS records for given name and type.""" - logger = logging.getLogger("modoboa.admin") + logger = logging.getLogger("modoboa.dns") try: resolver = get_authoritative_resolver(name, resolver=resolver) @@ -242,7 +242,7 @@ def get_dns_records(name, typ, resolver=None): def get_domain_mx_list(domain): """Return a list of MX IP address for domain.""" result = [] - logger = logging.getLogger("modoboa.admin") + logger = logging.getLogger("modoboa.dns") resolver = get_dns_resolver() dns_answers = get_dns_records(domain, "MX", resolver) if dns_answers is None: diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index 7ba925386..8d5ced9e5 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -361,6 +361,11 @@ LOGGING = { 'facility': SysLogHandler.LOG_MAIL, 'formatter': 'syslog' }, + 'syslog': { + 'class': 'logging.handlers.SysLogHandler', + 'facility': SysLogHandler.LOG_SYSLOG, + 'formatter': 'syslog' + }, 'modoboa': { 'class': 'modoboa.core.loggers.SQLHandler', } @@ -381,6 +386,11 @@ LOGGING = { 'level': 'INFO', 'propagate': False }, + 'modoboa.dns': { + 'handlers': ['syslog'], + 'level': 'INFO', + 'propagate': False + }, 'modoboa.policyd': { 'handlers': ['syslog-mail'], 'level': 'INFO',