Browse Source

Merge commit 'a9278ce' into bfgminer

Conflicts:
	miner.c
Luke Dashjr 13 years ago
parent
commit
d286074379
1 changed files with 4 additions and 9 deletions
  1. 4 9
      miner.c

+ 4 - 9
miner.c

@@ -97,7 +97,6 @@ bool opt_loginput;
 const int opt_cutofftemp = 95;
 const int opt_cutofftemp = 95;
 static int opt_retries = -1;
 static int opt_retries = -1;
 int opt_fail_pause = 5;
 int opt_fail_pause = 5;
-static int fail_pause = 5;
 int opt_log_interval = 5;
 int opt_log_interval = 5;
 static int opt_queue = 1;
 static int opt_queue = 1;
 int opt_scantime = 60;
 int opt_scantime = 60;
@@ -2611,11 +2610,9 @@ static void *get_work_thread(void *userdata)
 		while (!get_upstream_work(ret_work, ce->curl)) {
 		while (!get_upstream_work(ret_work, ce->curl)) {
 			/* pause, then restart work-request loop */
 			/* pause, then restart work-request loop */
 			applog(LOG_DEBUG, "json_rpc_call failed on get work, retry after %d seconds",
 			applog(LOG_DEBUG, "json_rpc_call failed on get work, retry after %d seconds",
-				fail_pause);
-			sleep(fail_pause);
-			fail_pause += opt_fail_pause;
+				opt_fail_pause);
+			sleep(opt_fail_pause);
 		}
 		}
-		fail_pause = opt_fail_pause;
 
 
 		ret_work->queued = true;
 		ret_work->queued = true;
 	}
 	}
@@ -2822,11 +2819,9 @@ next_submit:
 
 
 		/* pause, then restart work-request loop */
 		/* pause, then restart work-request loop */
 		applog(LOG_INFO, "json_rpc_call failed on submit_work, retry after %d seconds",
 		applog(LOG_INFO, "json_rpc_call failed on submit_work, retry after %d seconds",
-			fail_pause);
-		sleep(fail_pause);
-		fail_pause += opt_fail_pause;
+			opt_fail_pause);
+		sleep(opt_fail_pause);
 	}
 	}
-	fail_pause = opt_fail_pause;
 	push_curl_entry(ce, pool);
 	push_curl_entry(ce, pool);
 out:
 out:
 	workio_cmd_free(wc);
 	workio_cmd_free(wc);