From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Wed, 2 Mar 2011 18:38:38 +0000 (+0000)
Subject: bug fix with srfsh.py introspection; better handling/reporting of service exceptions
X-Git-Tag: osrf_rel_2_0_1~20
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bd6db96c9e297512193a7228dc39e1190ddef139;p=OpenSRF.git

bug fix with srfsh.py introspection; better handling/reporting of service exceptions

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_2_0@2197 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/src/python/srfsh.py b/src/python/srfsh.py
index c3e226b..ba90c7a 100755
--- a/src/python/srfsh.py
+++ b/src/python/srfsh.py
@@ -206,7 +206,7 @@ class Srfsh(object):
         else:
             args[1] += '.all'
 
-        return handle_request(args)
+        return self.handle_request(args)
 
 
     def handle_router(self, parts):
@@ -289,6 +289,9 @@ class Srfsh(object):
             except osrf.net.XMPPNoRecipient:
                 self.report("Unable to communicate with %s\n" % service)
                 break
+            except osrf.ex.OSRFServiceException, e:
+                self.report("Server exception occurred: %s" % e)
+                break
 
             total = time.time() - start