Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

2 files changed, 5 insertions, 3 deletions

diff --git a/minion/module_loader.py b/minion/module_loader.py
index eef7433..4538fb2 100755
--- a/minion/module_loader.py
+++ b/minion/module_loader.py
@@ -18,7 +18,8 @@
 import distutils.sysconfig
 import os
 import sys
-from rhpl.translate import _
+from gettext import gettext
+_ = gettext
 
 
 def module_walker(topdir):
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)