Browse Source

Merge commit 'b495a51' into stratum

Luke Dashjr 13 years ago
parent
commit
f5abd20bf0
1 changed files with 3 additions and 1 deletions
  1. 3 1
      miner.c

+ 3 - 1
miner.c

@@ -4982,9 +4982,11 @@ static void *stratum_thread(void *userdata)
 			pool->swork.clean = false;
 			pool->swork.clean = false;
 			gen_stratum_work(pool, &work);
 			gen_stratum_work(pool, &work);
 			if (test_work_current(&work)) {
 			if (test_work_current(&work)) {
+				/* Only accept a work restart if this stratum
+				 * connection is from the current pool */
 				if (pool == current_pool()) {
 				if (pool == current_pool()) {
 					restart_threads();
 					restart_threads();
-					applog(LOG_NOTICE, "Stratum requested work restart for block change");
+					applog(LOG_NOTICE, "Stratum from pool %d requested work restart", pool->pool_no);
 				}
 				}
 			} else
 			} else
 				applog(LOG_NOTICE, "Stratum from pool %d detected new block", pool->pool_no);
 				applog(LOG_NOTICE, "Stratum from pool %d detected new block", pool->pool_no);