Merge pull request fiorix#89 from jonoberheide/master

make _remote_ip a property
hellais · Jan 29, 2013 · bda2b6b · bda2b6b
2 parents de85aba + 057a510
commit bda2b6b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cyclone/httpserver.py b/cyclone/httpserver.py
@@ -157,7 +157,7 @@ def _on_headers(self, data):
             headers = httputil.HTTPHeaders.parse(data[eol:])
             self._request = HTTPRequest(
                 connection=self, method=method, uri=uri, version=version,
-                headers=headers, remote_ip=self._remote_ip())
+                headers=headers, remote_ip=self._remote_ip)
 
             content_length = int(headers.get("Content-Length", 0))
             if content_length:
@@ -169,7 +169,7 @@ def _on_headers(self, data):
 
             self.request_callback(self._request)
         except _BadRequestException, e:
-            log.msg("Malformed HTTP request from %s: %s", self._remote_ip(), e)
+            log.msg("Malformed HTTP request from %s: %s", self._remote_ip, e)
             self.transport.loseConnection()
 
     def _on_request_body(self, data):
@@ -197,6 +197,7 @@ def _on_request_body(self, data):
                     log.msg("Invalid multipart/form-data")
         self.request_callback(self._request)
 
+    @property
     def _remote_ip(self):
         peer = self.transport.getPeer()
         if isinstance(peer, address.UNIXAddress):