X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=blobdiff_plain;f=p2pool%2Fwork.py;h=e1c677d1ab3d4a2758f741fd8396287de91d221c;hp=d7e77763e77142dcd131957d502a6d7f026ec880;hb=8e7cb8223a38bdd4ff55971d2945f5ccb571e063;hpb=4e7adf06f15f9bca409a5a5fe3ef03deac7d2268 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')),