git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(from parent 1:
cd17aaf
)
do not raise an error, send it in the result instead
author
ThomasV
<thomasv@gitorious>
Sat, 24 Nov 2012 17:58:21 +0000 (21:58 +0400)
committer
ThomasV
<thomasv@gitorious>
Sat, 24 Nov 2012 17:58:21 +0000 (21:58 +0400)
backends/bitcoind/blockchain_processor.py
patch
|
blob
|
history
diff --git
a/backends/bitcoind/blockchain_processor.py
b/backends/bitcoind/blockchain_processor.py
index
6f4390f
..
83c79ac
100644
(file)
--- 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: