review management of relationships - allow to update them with sfaadmin

[sfa.git] / sfa / plc / plshell.py

diff --git a/sfa/plc/plshell.py b/sfa/plc/plshell.py
index e1e6d49..d2cd9cd 100644 (file)
--- a/sfa/plc/plshell.py
+++ b/sfa/plc/plshell.py
@@ -1,4 +1,7 @@
+import sys
 import xmlrpclib
+import socket
+from urlparse import urlparse
 
 from sfa.util.sfalogging import logger
 
@@ -34,10 +37,16 @@ class PlShell:
         hostname=urlparse(url).hostname
         is_local=False
         if hostname == 'localhost': is_local=True
-        # otherwise compare IP addresses
-        url_ip=socket.gethostbyname(hostname)
-        local_ip=socket.gethostbyname(socket.gethostname())
-        if url_ip==local_ip: is_local=True
+        # otherwise compare IP addresses; 
+        # this might fail for any number of reasons, so let's harden that
+        try:
+            # xxx todo this seems to result in a DNS request for each incoming request to the AM
+            # should be cached or improved
+            url_ip=socket.gethostbyname(hostname)
+            local_ip=socket.gethostbyname(socket.gethostname())
+            if url_ip==local_ip: is_local=True
+        except:
+            pass
 
         if is_local:
             try:
@@ -62,7 +71,7 @@ class PlShell:
                             'Username':   config.SFA_PLC_USER,
                             'AuthString': config.SFA_PLC_PASSWORD,
                             }
-            self.proxy = xmlrpclib.Server(url, verbose = 0, allow_none = True)
+            self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True)
 
     def __getattr__(self, name):
         def func(*args, **kwds):
@@ -72,6 +81,6 @@ class PlShell:
             if not actual_name:
                 raise Exception, "Illegal method call %s for PL driver"%(name)
             result=getattr(self.proxy, actual_name)(self.plauth, *args, **kwds)
-            logger.info('%s (%s) returned ... %s'%(name,actual_name,result))
+            logger.debug('PlShell %s (%s) returned ... '%(name,actual_name))
             return result
         return func