From: Forrest Voight <forrest@forre.st>
Date: Sun, 24 Nov 2013 06:27:48 +0000 (-0500)
Subject: print RPC URL of merged mining daemon whose getauxblock call failed
X-Git-Tag: 13.4^0
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=8e7cb8223a38bdd4ff55971d2945f5ccb571e063

print RPC URL of merged mining daemon whose getauxblock call failed
---

diff --git a/p2pool/work.py b/p2pool/work.py
index d7e7776..e1c677d 100644
--- a/p2pool/work.py
+++ b/p2pool/work.py
@@ -67,7 +67,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
         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')),