From: Forrest Voight <forrest@forre.st>
Date: Sun, 24 Jun 2012 16:03:24 +0000 (-0400)
Subject: changed delay on getauxblock error from 1 second to 30 so there's less spam when... 
X-Git-Tag: 3.2~25
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=78502eca110500ab27fab05cfaedec5b77c3c917;p=p2pool.git

changed delay on getauxblock error from 1 second to 30 so there's less spam when mm daemons aren't running
---

diff --git a/p2pool/work.py b/p2pool/work.py
index 57c9769..0b76b57 100644
--- a/p2pool/work.py
+++ b/p2pool/work.py
@@ -61,7 +61,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
         def set_merged_work(merged_url, merged_userpass):
             merged_proxy = jsonrpc.Proxy(merged_url, dict(Authorization='Basic ' + base64.b64encode(merged_userpass)))
             while True:
-                auxblock = yield deferral.retry('Error while calling merged getauxblock:', 1)(merged_proxy.rpc_getauxblock)()
+                auxblock = yield deferral.retry('Error while calling merged getauxblock:', 30)(merged_proxy.rpc_getauxblock)()
                 self.merged_work.set(dict(self.merged_work.value, **{auxblock['chainid']: dict(
                     hash=int(auxblock['hash'], 16),
                     target=pack.IntType(256).unpack(auxblock['target'].decode('hex')),