Browse Source

stratum: hide timeout warnings while waiting

this timeout is not important, we reconnect after
2upstream
Tanguy Pruvot 9 years ago
parent
commit
2673b3aeff
  1. 6
      ccminer.cpp
  2. 2
      util.cpp

6
ccminer.cpp

@ -149,6 +149,7 @@ struct pool_infos pools[MAX_POOLS] = { 0 };
int num_pools = 1; int num_pools = 1;
volatile int cur_pooln = 0; volatile int cur_pooln = 0;
bool opt_pool_failover = true; bool opt_pool_failover = true;
volatile bool pool_on_hold = false;
volatile bool pool_is_switching = false; volatile bool pool_is_switching = false;
volatile int pool_switch_count = 0; volatile int pool_switch_count = 0;
bool conditional_pool_rotate = false; bool conditional_pool_rotate = false;
@ -1644,10 +1645,12 @@ static void *miner_thread(void *userdata)
continue; continue;
} }
pool_on_hold = true;
sleep(5); sleep(5);
if (!thr_id) pools[cur_pooln].wait_time += 5; if (!thr_id) pools[cur_pooln].wait_time += 5;
continue; continue;
} }
pool_on_hold = false;
work_restart[thr_id].restart = 0; work_restart[thr_id].restart = 0;
@ -2294,7 +2297,8 @@ wait_stratum_url:
if (!s) { if (!s) {
stratum_disconnect(&stratum); stratum_disconnect(&stratum);
applog(LOG_WARNING, "Stratum connection interrupted"); if (!opt_quiet && !pool_on_hold)
applog(LOG_WARNING, "Stratum connection interrupted");
continue; continue;
} }
if (!stratum_handle_method(&stratum, s)) if (!stratum_handle_method(&stratum, s))

2
util.cpp

@ -988,7 +988,7 @@ char *stratum_recv_line(struct stratum_ctx *sctx)
} while (time(NULL) - rstart < timeout && !strstr(sctx->sockbuf, "\n")); } while (time(NULL) - rstart < timeout && !strstr(sctx->sockbuf, "\n"));
if (!ret) { if (!ret) {
applog(LOG_ERR, "stratum_recv_line failed"); if (opt_debug) applog(LOG_ERR, "stratum_recv_line failed");
goto out; goto out;
} }
} }

Loading…
Cancel
Save