diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-28 15:37:55 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-28 15:37:55 -0400 |
| commit | fe2993777f86b479bec4e2daf7eef91813537f6d (patch) | |
| tree | 2f993b7ae9eca2e0e2d1b65b3fef77f2bdc27156 /minion/server.py | |
| parent | 114dd90baf8d300e7ba6f058fe42a0d2ebdbd223 (diff) | |
| parent | 99a55551d25a81bf019a90193f084eba386f2512 (diff) | |
| download | func-7d8d06776925aa7b549039fea34c7451bff7fce1.tar.gz func-7d8d06776925aa7b549039fea34c7451bff7fce1.tar.xz func-7d8d06776925aa7b549039fea34c7451bff7fce1.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/funcv0.0.12
Diffstat (limited to 'minion/server.py')
| -rwxr-xr-x | minion/server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/minion/server.py b/minion/server.py index fcfe537..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" @@ -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) |