Browse Source

Close any existing stratum socket if we are attempting to restart stratum so the pool knows the connection has gone.

Con Kolivas 13 years ago
parent
commit
6875dc46b6
1 changed files with 11 additions and 9 deletions
  1. 11 9
      util.c

+ 11 - 9
util.c

@@ -1627,15 +1627,6 @@ out:
 	return ret;
 }
 
-bool restart_stratum(struct pool *pool)
-{
-	if (!initiate_stratum(pool))
-		return false;
-	if (!auth_stratum(pool))
-		return false;
-	return true;
-}
-
 void suspend_stratum(struct pool *pool)
 {
 	applog(LOG_INFO, "Closing socket for stratum pool %d", pool->pool_no);
@@ -1645,6 +1636,17 @@ void suspend_stratum(struct pool *pool)
 	CLOSESOCKET(pool->sock);
 }
 
+bool restart_stratum(struct pool *pool)
+{
+	if (pool->stratum_active)
+		suspend_stratum(pool);
+	if (!initiate_stratum(pool))
+		return false;
+	if (!auth_stratum(pool))
+		return false;
+	return true;
+}
+
 void dev_error(struct cgpu_info *dev, enum dev_reason reason)
 {
 	dev->device_last_not_well = time(NULL);