From 344f87d8fbee06d7c7526799dd53f598c1924e47 Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Tue, 13 Mar 2012 09:35:01 +0100
Subject: [PATCH] Add a config key to ignore reverse DNS (fixes #779)

---
 config               | 2 ++
 radicale/__init__.py | 8 ++++++++
 radicale/config.py   | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config b/config
index cb72de49..1819f3e7 100644
--- a/config
+++ b/config
@@ -25,6 +25,8 @@ ssl = False
 certificate = /etc/apache2/ssl/server.crt
 # SSL private key
 key = /etc/apache2/ssl/server.key
+# Reverse DNS to resolve client address in logs
+dns_lookup = True
 
 
 [encoding]
diff --git a/radicale/__init__.py b/radicale/__init__.py
index aa240873..691fc7da 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -105,6 +105,14 @@ class RequestHandler(wsgiref.simple_server.WSGIRequestHandler):
     def log_message(self, *args, **kwargs):
         """Disable inner logging management."""
 
+    def address_string(self):
+        """Client address, formatted for logging."""
+        if config.getboolean("server", "dns_lookup"):
+            return \
+                wsgiref.simple_server.WSGIRequestHandler.address_string(self)
+        else:
+            return self.client_address[0]
+
 
 class Application(object):
     """WSGI application managing collections."""
diff --git a/radicale/config.py b/radicale/config.py
index 887a3260..23735af0 100644
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -44,7 +44,8 @@ INITIAL_CONFIG = {
         "pid": "",
         "ssl": "False",
         "certificate": "/etc/apache2/ssl/server.crt",
-        "key": "/etc/apache2/ssl/server.key"},
+        "key": "/etc/apache2/ssl/server.key",
+        "dns_lookup": "True"},
     "encoding": {
         "request": "utf-8",
         "stock": "utf-8"},