Crash while pool closing connection fixed and minor cosmetic changes

BScrk · Oct 9, 2017 · 581580a · 581580a
1 parent b3bcf24
commit 581580a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lib/miners_controller.js b/lib/miners_controller.js
@@ -81,7 +81,7 @@ Miner.prototype.onData = function(obj) {
             this.send({id:this.lastReqId,result:[this.ctrl.proxy.sessionId,this.ctrl.proxy.sessionId],error:null});
         }
     }else if(obj.method == "mining.authorize"){
-        logger.log ( "New peer connected : " + obj.params[0]);
+        logger.log ( "New peer connected : " + chalk.blueBright(obj.params[0]));
         this.name = obj.params[0];
         if(this.ctrl.proxy.status != "ready"){
             this.Error("Proxy not authorised yet");
@@ -110,7 +110,7 @@ Miner.prototype.Error = function(msg) {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Miner.prototype.onEnd = function() {
-    logger.log ( "peer " + this.name + " disconnected");
+    logger.warn ( "peer " + chalk.blueBright(this.name) + " disconnected");
     logger.dbg('[MINER<'+this.id+'>:DISCONNECTED] ');
     this.ctrl.removeMiner(this.id);
     logger.log ( this.ctrl.miners.size + " peer(s) mining on this proxy");

diff --git a/lib/pool_connector.js b/lib/pool_connector.js
@@ -40,10 +40,6 @@ var PoolConnector = function(restartCallback){
     this.onData = function(obj) {
         logger.dbg('====================================')
         logger.dbg('[POOL:IN] ' + JSON.stringify(obj));
-
-
-
-
         if (this.status == 'subscribing' && (obj.id == 1)) { // Subscription (internal)
             if(obj.error){
                 this.error(obj.error);
@@ -83,8 +79,8 @@ var PoolConnector = function(restartCallback){
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     this.onEnd = function() {
         logger.log('Pool closed the connection... Restart proxy');
-        this.reconnect();        
-    };
+        setTimeout( () => { restartCallback(); },1000);
+};
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     this.send = function(obj){
         logger.dbg('[POOL:OUT] ' + obj.method + ': ' + JSON.stringify(obj));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zecproxy",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Zcash Stratum Proxy",
   "main": "proxy.js",
   "scripts": {},