Merge pull request #6 from kkkrackpot/master

Fix double jsonification and setpool controls

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
@@ -60,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()
 

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))

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