backend/common/rhnApache.py | 4 ++--
backend/server/apacheHandler.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 13a54b6884e7bfa47a54be96f61c680a25df05b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 13 10:04:02 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.18-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e58d2ef..2a95409 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.17
+Version: 1.6.18
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -674,6 +674,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Sep 13 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.18-1
+- 736127 - fixed /var/log/rhn/rhn_server_xmlrpc.log does not log IP addresses
+
* Mon Sep 12 2011 Miroslav Suchý 1.6.17-1
- add missing import sys
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 60ca6de..1ee7808 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.17-1 backend/
+1.6.18-1 backend/
commit 33f707177bca9cc70a8b413385b428198761770d
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Fri Sep 9 10:00:02 2011 -0300
736127 - fixed /var/log/rhn/rhn_server_xmlrpc.log does not log IP addresses
Before:
2011/08/30 17:37:49 +13:00 19502 0.0.0.0: xmlrpc/queue.get(1000010000,
2,'checkins enabled')
2011/08/30 17:37:50 +13:00 19135 0.0.0.0:
xmlrpc/registration.update_packages(1000010000, 'packages: 1016')
After:
2011/09/09 09:52:59 -02:00 11764 10.12.56.89:
xmlrpc/registration.update_packages(1000010003, 'packages: 681')
2011/09/09 09:52:59 -02:00 11764 10.12.56.89:
rhnServer/server_solarispatches.dispose_patched_packages(1000010003, 'disposing of
patched packages')
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index 15c5464..941d275 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -27,8 +27,7 @@ from spacewalk.common import apache
# Now local module imports
import rhnFlags
from rhn.UserDictCase import UserDictCase
-from rhnLog import log_debug
-from rhnLog import log_error
+from rhnLog import log_debug, log_error, log_setreq
from rhnTranslate import cat
class rhnApache:
@@ -58,6 +57,7 @@ class rhnApache:
input object
"""
+ log_setreq(req)
log_debug(3)
self.start_time = time.time()
# Decline if this is a subrequest:
diff --git a/backend/server/apacheHandler.py b/backend/server/apacheHandler.py
index 5c22670..26f8a0b 100644
--- a/backend/server/apacheHandler.py
+++ b/backend/server/apacheHandler.py
@@ -20,7 +20,7 @@ import string
from spacewalk.common import apache, rhnApache, rhnTB, rhnFlags
from spacewalk.common.rhnException import rhnException, rhnFault
from spacewalk.common.rhnConfig import CFG, initCFG
-from spacewalk.common.rhnLog import log_debug, log_error, initLOG
+from spacewalk.common.rhnLog import log_debug, log_error, initLOG, log_setreq
# local module imports
import rhnSQL
@@ -57,6 +57,7 @@ class apacheHandler(apacheSession):
def headerParserHandler(self, req):
+ log_setreq(req)
##We need to init CFG and Logging
options = req.get_options()
# if we are initializing out of a <Location> handler don't