From b0197f5fbff9cec35d8479c6a3cd3cf067d886c5 Mon Sep 17 00:00:00 2001 From: fhlfibh Date: Fri, 9 Mar 2018 21:47:20 +0300 Subject: [PATCH 1/3] Fix double jsonification, to keep ccminer happy. --- control.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/control.py b/control.py index 66d8116..25748ed 100644 --- a/control.py +++ b/control.py @@ -41,8 +41,7 @@ def reconnect_all(self): self.log.info("sending reconnect to all miners") proxy_list = self.proxies.list() for p in proxy_list: - reconnect = json.dumps(self.manager.get_reconnect()) + '\n' - p.miners_broadcast(reconnect) + p.miners_broadcast(self.manager.get_reconnect()) # Wait two seconds to let the miners get the order time.sleep(3) # Close sockets From f3f3a188c58cb838ca3d846c99698690e897d88a Mon Sep 17 00:00:00 2001 From: fhlfibh Date: Fri, 9 Mar 2018 23:03:42 +0300 Subject: [PATCH 2/3] Some hackery to fix setpool control --- control.py | 2 +- strelay.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/control.py b/control.py index 25748ed..b6ec74c 100644 --- a/control.py +++ b/control.py @@ -59,7 +59,7 @@ def set_pool(self, pool, port, user=None, passw=None, force=False): if user: self.poolmap["user"] = user if passw: - self.poolmap["passw"] = passw + self.poolmap["pass"] = passw if force: self.reconnect_all() diff --git a/strelay.py b/strelay.py index 18f1e18..85bf4f8 100644 --- a/strelay.py +++ b/strelay.py @@ -123,6 +123,8 @@ def parse_args(): controller.listen_port = args.control_port controller.poolmap['pool'] = args.pool controller.poolmap['port'] = args.port +controller.poolmap['user'] = args.username +controller.poolmap['pass'] = args.password t = threading.Thread(target=controller.start, args=[]) t.daemon = True t.start() @@ -138,7 +140,7 @@ def parse_args(): controller.poolmap['pool'], controller.poolmap['port']) pool = pool_connection.connect() proxy = Proxy.Proxy(pool, sharestats=shares) - proxy.set_auth(args.username, args.password) + proxy.set_auth(controller.poolmap['user'], controller.poolmap['pass']) proxy.add_miner(miner) t = threading.Thread(target=proxy.start, args=[]) t.daemon = True From adb03589eb5d3b174edbf050ab444f56d5180f4b Mon Sep 17 00:00:00 2001 From: fhlfibh Date: Wed, 14 Mar 2018 23:12:59 +0300 Subject: [PATCH 3/3] Fix date format (https://github.com/dneldnel/stratum-relay/commit/f349ba9a71ba4891c615a6f14ab49a4ebdba8fe5) --- log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log.py b/log.py index 8b08eec..f541dc2 100644 --- a/log.py +++ b/log.py @@ -31,4 +31,4 @@ def write(self, msg, type): fd.write("[%d][%s][%s] %s\n" % (int(time.time()), type, self.id, msg)) if stdout: - print("[%d][%s][%s] %s" % (int(time.time()), type, self.id, msg)) + print("[%s][%s][%s] %s" % (time.strftime("%Y-%m-%d %H:%M:%S"), type, self.id, msg))