From af52e8e8c2b89ce36797427770bb9e9b564cb7d4 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 12 Dec 2012 12:01:18 +0100
Subject: [PATCH] Minor update for an Issue #287

---
 lib/utils/xmlrpc.py | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/lib/utils/xmlrpc.py b/lib/utils/xmlrpc.py
index 4767fc12b..c08ada166 100644
--- a/lib/utils/xmlrpc.py
+++ b/lib/utils/xmlrpc.py
@@ -60,20 +60,24 @@ if __name__ == "__main__":
     except ImportError:
         pass
 
-    server = xmlrpclib.ServerProxy("http://localhost:%d" % (int(sys.argv[1]) if len(sys.argv) > 1 else 8776))
-
-    print "[o] Server instance: 'server'"
-    print "[i] Available RPC methods: %s" % str(server.system.listMethods()).strip("[]")
-    print "[i] Sample usage: 'server.system.listMethods()'"
-
-    while True:
-        try:
-            _ = raw_input("> ")
-            if not _.startswith("print"):
-                print eval(_) or ""
-            else:
-                exec(_)
-        except KeyboardInterrupt:
-            exit(0)
-        except Exception, ex:
-            print "[x] '%s'" % str(ex)
+    try:
+        addr = "http://localhost:%d" % (int(sys.argv[1]) if len(sys.argv) > 1 else 8776)
+        print "[i] Starting debug XML-RPC client to '%s'..." % addr
+        server = xmlrpclib.ServerProxy(addr)
+        print "[i] Available RPC methods: %s" % str(server.system.listMethods()).strip("[]")
+        print "[i] Server instance name: 'server'"
+        print "[i] Sample usage: 'server.system.listMethods()'"
+    except Exception, ex:
+        print "[x] '%s'" % str(ex)
+    else:
+        while True:
+            try:
+                _ = raw_input("> ")
+                if not _.startswith("print"):
+                    print eval(_) or ""
+                else:
+                    exec(_)
+            except KeyboardInterrupt:
+                exit(0)
+            except Exception, ex:
+                print "[x] '%s'" % str(ex)