Skip to content

Commit

Permalink
print RPC URL of merged mining daemon whose getauxblock call failed
Browse files Browse the repository at this point in the history
  • Loading branch information
forrestv committed Nov 24, 2013
1 parent 4e7adf0 commit 8e7cb82
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion p2pool/work.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _(share):
def set_merged_work(merged_url, merged_userpass):
merged_proxy = jsonrpc.HTTPProxy(merged_url, dict(Authorization='Basic ' + base64.b64encode(merged_userpass)))
while self.running:
auxblock = yield deferral.retry('Error while calling merged getauxblock:', 30)(merged_proxy.rpc_getauxblock)()
auxblock = yield deferral.retry('Error while calling merged getauxblock on %s:' % (merged_url,), 30)(merged_proxy.rpc_getauxblock)()
self.merged_work.set(math.merge_dicts(self.merged_work.value, {auxblock['chainid']: dict(
hash=int(auxblock['hash'], 16),
target='p2pool' if auxblock['target'] == 'p2pool' else pack.IntType(256).unpack(auxblock['target'].decode('hex')),
Expand Down

0 comments on commit 8e7cb82

Please sign in to comment.