From 5cf842773c81052a8dc29529a10ed2346787d5cf Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 18 May 2013 11:22:32 +0200
Subject: [PATCH] Non greedy regex and default logging config.

see #320
---
 modoboa/admin/templatetags/admin_extras.py |  2 +-
 modoboa/auth/views.py                      |  2 +-
 modoboa/core/templates/settings.py         | 24 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modoboa/admin/templatetags/admin_extras.py b/modoboa/admin/templatetags/admin_extras.py
index 49083366a..ef4b92e17 100644
--- a/modoboa/admin/templatetags/admin_extras.py
+++ b/modoboa/admin/templatetags/admin_extras.py
@@ -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)
diff --git a/modoboa/auth/views.py b/modoboa/auth/views.py
index 796ebb2c9..f2c9d7612 100755
--- a/modoboa/auth/views.py
+++ b/modoboa/auth/views.py
@@ -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"]})
 
diff --git a/modoboa/core/templates/settings.py b/modoboa/core/templates/settings.py
index 5a9197c09..4a6197b52 100644
--- a/modoboa/core/templates/settings.py
+++ b/modoboa/core/templates/settings.py
@@ -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
+        }
     }
 }