From: ThomasV <thomasv@gitorious>
Date: Sat, 24 Nov 2012 17:58:21 +0000 (+0400)
Subject: do not raise an error, send it in the result instead
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=d8894101757e87ff9234f4a0d60245349226f5fe

do not raise an error, send it in the result instead
---

diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py
index 6f4390f..83c79ac 100644
--- a/backends/bitcoind/blockchain_processor.py
+++ b/backends/bitcoind/blockchain_processor.py
@@ -591,9 +591,13 @@ class BlockchainProcessor(Processor):
                     print_log( "error:", error)
 
         elif method == 'blockchain.transaction.broadcast':
-            txo = self.bitcoind('sendrawtransaction', params)
-            print_log( "sent tx:", txo )
-            result = txo 
+            try:
+                txo = self.bitcoind('sendrawtransaction', params)
+                print_log( "sent tx:", txo )
+                result = txo 
+            except BaseException, e:
+                result = str(e) # do not send an error
+                print_log( "error:", str(e), params )
 
         elif method == 'blockchain.transaction.get_merkle':
             if cache_only: