mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
@@ -341,4 +341,4 @@ def colorize_level(level):
|
||||
|
||||
@register.filter
|
||||
def tohtml(message):
|
||||
return re.sub("'(.*)'", "<strong>\g<1></strong>", message)
|
||||
return re.sub("'(.*?)'", "<strong>\g<1></strong>", message)
|
||||
|
||||
@@ -39,7 +39,7 @@ def dologin(request):
|
||||
nextlocation = reverse("domains")
|
||||
return HttpResponseRedirect(nextlocation)
|
||||
error = _("Your username and password didn't match. Please try again.")
|
||||
logger.warning("Failed connection attempt from %(addr)s as user %(user)s" \
|
||||
logger.warning("Failed connection attempt from '%(addr)s' as user '%(user)s'" \
|
||||
% {"addr": request.META["REMOTE_ADDR"],
|
||||
"user": form.cleaned_data["username"]})
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Django settings for {{ name }} project.
|
||||
import os
|
||||
from logging.handlers import SysLogHandler
|
||||
|
||||
DEBUG = True
|
||||
TEMPLATE_DEBUG = DEBUG
|
||||
@@ -181,11 +182,24 @@ LOGGING = {
|
||||
'()': 'django.utils.log.RequireDebugFalse'
|
||||
}
|
||||
},{% endif %}
|
||||
'formatters': {
|
||||
'syslog': {
|
||||
'format': '%(name)s: %(levelname)s %(message)s'
|
||||
},
|
||||
},
|
||||
'handlers': {
|
||||
'mail_admins': {
|
||||
'level': 'ERROR',{% if django14 %}
|
||||
'filters': ['require_debug_false'],{% endif %}
|
||||
'class': 'django.utils.log.AdminEmailHandler'
|
||||
},
|
||||
'syslog-auth': {
|
||||
'class': 'logging.handlers.SysLogHandler',
|
||||
'facility': SysLogHandler.LOG_AUTH,
|
||||
'formatter': 'syslog'
|
||||
},
|
||||
'modoboa': {
|
||||
'class': 'modoboa.lib.logutils.SQLHandler',
|
||||
}
|
||||
},
|
||||
'loggers': {
|
||||
@@ -194,5 +208,15 @@ LOGGING = {
|
||||
'level': 'ERROR',
|
||||
'propagate': True,
|
||||
},
|
||||
'modoboa.auth': {
|
||||
'handlers': ['syslog-auth', 'modoboa'],
|
||||
'level': 'INFO',
|
||||
'propagate': False
|
||||
},
|
||||
'modoboa.admin': {
|
||||
'handlers': ['modoboa'],
|
||||
'level': 'INFO',
|
||||
'propagate': False
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user