From c36de46938255f1e16861981db3c59990e6f7b0c Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Fri, 28 Sep 2007 13:15:14 -0400 Subject: log the ip address of the requester to the audit.log also ditch the "INFO" blurb in the log, since we don't really log at any other level --- minion/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'minion/server.py') diff --git a/minion/server.py b/minion/server.py index fcfe537..7c2c149 100755 --- a/minion/server.py +++ b/minion/server.py @@ -192,6 +192,7 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer, if hasattr(self, '_this_request'): r,a = self._this_request p = r.get_peer_certificate() + ip = a[0] cn = p.get_subject().CN sub_hash = p.subject_name_hash() else: @@ -199,7 +200,7 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer, # XXX FIXME - need to figure out how to dig into the server base classes # so we can get client ip, and eventually cert id info -akl - self.audit_logger.log_call(cn, sub_hash, method, params) + self.audit_logger.log_call(ip, cn, sub_hash, method, params) return self.get_dispatch_method(method)(*params) -- cgit From 99a55551d25a81bf019a90193f084eba386f2512 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Fri, 28 Sep 2007 15:28:05 -0400 Subject: remove rhpl dep use python gettext instead of rhpl.gettext stuff --- minion/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minion/server.py') diff --git a/minion/server.py b/minion/server.py index 7c2c149..5671836 100755 --- a/minion/server.py +++ b/minion/server.py @@ -21,7 +21,7 @@ import sys import traceback import socket -from rhpl.translate import textdomain +from gettext import textdomain I18N_DOMAIN = "func" -- cgit