Non greedy regex and default logging config.

see #320
This commit is contained in:
Antoine Nguyen
2013-05-18 11:22:32 +02:00
parent 5ebc6b3cc8
commit 5cf842773c
3 changed files with 26 additions and 2 deletions
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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"]})
+24
View File
@@ -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
}
}
}