From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 23 Jan 2012 07:02:21 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.11~29
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=79ad402f4c4756d7bf6129513be9b6784ff41696;hp=edcd094e7e9c1f018f0664f78cf7d6c625e1f476

Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
---

diff --git a/python/ashd/perf.py b/python/ashd/perf.py
index d3d3cb7..97146a8 100644
--- a/python/ashd/perf.py
+++ b/python/ashd/perf.py
@@ -16,6 +16,8 @@ if pdm:
             self.method = env.get("REQUEST_METHOD")
             self.uri = env.get("REQUEST_URI")
             self.host = env.get("HTTP_HOST")
+            self.remoteaddr = env.get("REMOTE_ADDR")
+            self.remoteport = env.get("REMOTE_PORT")
 
     class reqfinish(pdm.perf.finishevent):
         def __init__(self, start, aborted, status):
diff --git a/python3/ashd/perf.py b/python3/ashd/perf.py
index 0d1e7aa..6942424 100644
--- a/python3/ashd/perf.py
+++ b/python3/ashd/perf.py
@@ -13,14 +13,16 @@ if pdm:
 
     class reqstart(pdm.perf.startevent):
         def __init__(self, env):
-            super(reqstart, self).__init__()
+            super().__init__()
             self.method = env.get("REQUEST_METHOD")
             self.uri = env.get("REQUEST_URI")
             self.host = env.get("HTTP_HOST")
+            self.remoteaddr = env.get("REMOTE_ADDR")
+            self.remoteport = env.get("REMOTE_PORT")
 
     class reqfinish(pdm.perf.finishevent):
         def __init__(self, start, aborted, status):
-            super(reqfinish, self).__init__(start, aborted)
+            super().__init__(start, aborted)
             self.status = status
 
 class request(object):