GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-03 02:24:35 +00:00
Code Issues Releases Wiki Activity

Only put the message that a pool is down if not pinging it every minute.

Browse Source
This commit is contained in:
Con Kolivas 2011-08-12 23:58:00 +10:00
parent 510be5c9a4
commit 6da13fb87f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -2241,7 +2241,7 @@ static int requests_queued(void)
return ret; return ret;
} }
static bool pool_active(struct pool *pool) static bool pool_active(struct pool *pool, bool pinging)
{ {
bool ret = false; bool ret = false;
json_t *val; json_t *val;
@ -2284,7 +2284,8 @@ static bool pool_active(struct pool *pool)
} else { } else {
applog(LOG_DEBUG, "FAILED to retrieve work from pool %u %s", applog(LOG_DEBUG, "FAILED to retrieve work from pool %u %s",
pool->pool_no, pool->rpc_url); pool->pool_no, pool->rpc_url);
applog(LOG_WARNING, "Pool down, URL or credentials invalid"); if (!pinging)
applog(LOG_WARNING, "Pool down, URL or credentials invalid");
} }
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
@ -2443,7 +2444,7 @@ static bool divide_work(struct timeval *now, struct work *work, uint32_t hash_di
{ {
uint64_t hash_inc; uint64_t hash_inc;
if (hash_div < 3 || work->clone) if (work->clone)
return false; return false;
hash_inc = MAXTHREADS / hash_div * 2; hash_inc = MAXTHREADS / hash_div * 2;
@ -2455,6 +2456,9 @@ static bool divide_work(struct timeval *now, struct work *work, uint32_t hash_di
if (opt_debug) if (opt_debug)
applog(LOG_DEBUG, "Successfully divided work"); applog(LOG_DEBUG, "Successfully divided work");
return true; return true;
} else if (can_roll(work)) {
roll_work(work);
return true;
} }
return false; return false;
} }
@ -3533,7 +3537,7 @@ static void *watchdog_thread(void *userdata)
/* Test pool is idle once every minute */ /* Test pool is idle once every minute */
if (pool->idle && now.tv_sec - pool->tv_idle.tv_sec > 60) { if (pool->idle && now.tv_sec - pool->tv_idle.tv_sec > 60) {
gettimeofday(&pool->tv_idle, NULL); gettimeofday(&pool->tv_idle, NULL);
if (pool_active(pool) && pool_tclear(pool, &pool->idle)) if (pool_active(pool, true) && pool_tclear(pool, &pool->idle))
pool_resus(pool); pool_resus(pool);
} }
} }
@ -3730,7 +3734,7 @@ static bool input_pool(bool live)
/* Test the pool before we enable it if we're live running, otherwise /* Test the pool before we enable it if we're live running, otherwise
* it will be tested separately */ * it will be tested separately */
ret = true; ret = true;
if (live && pool_active(pool)) if (live && pool_active(pool, false))
pool->enabled = true; pool->enabled = true;
pools[total_pools++] = pool; pools[total_pools++] = pool;
out: out:
@ -4040,7 +4044,7 @@ int main (int argc, char *argv[])
struct pool *pool; struct pool *pool;
pool = pools[i]; pool = pools[i];
if (pool_active(pool)) { if (pool_active(pool, false)) {
if (!currentpool) if (!currentpool)
currentpool = pool; currentpool = pool;
applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url); applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url);