From 628ac199771ba607d5c75e0def9c302dd7a5d51e Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 28 Apr 2012 14:00:34 +1000 Subject: [PATCH] Get rid of confusing "waiting on fresh work" part of longpoll message to minimise log width and add pool number to longpoll work restart message. --- NEWS | 10 ++++++++-- cgminer.c | 9 +++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 499b0e79..fcaeb204 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ -Version 2.3.5 - +Version 2.3.5 - April 28, 2012 + +- Restarting cgminer leads to a socket that can't be bound for 60 seconds, so +increase the interval that API binding waits to 30 seconds to minimise the +number of times it will retry, spamming the logs. +- Give a longpoll message for any longpoll that detects a block change, primary +or backup, and also display which pool it was. +- Decrease utility display to one decimal place. - Small cosmetic output alignment. - Add pool number to stale share message. - Add space to log output now that there is more screen real estate available. diff --git a/cgminer.c b/cgminer.c index b0161141..ef13b0df 100644 --- a/cgminer.c +++ b/cgminer.c @@ -2376,18 +2376,19 @@ static void test_work_current(struct work *work) work_block++; if (work->longpoll) { - applog(LOG_NOTICE, "LONGPOLL from pool %d detected new block, waiting on fresh work", + applog(LOG_NOTICE, "LONGPOLL from pool %d detected new block", work->pool->pool_no); work->longpoll = false; } else if (have_longpoll) - applog(LOG_NOTICE, "New block detected on network before longpoll, waiting on fresh work"); + applog(LOG_NOTICE, "New block detected on network before longpoll"); else - applog(LOG_NOTICE, "New block detected on network, waiting on fresh work"); + applog(LOG_NOTICE, "New block detected on network"); restart_threads(); } else if (work->longpoll) { work->longpoll = false; if (work->pool == current_pool()) { - applog(LOG_NOTICE, "LONGPOLL requested work restart, waiting on fresh work"); + applog(LOG_NOTICE, "LONGPOLL from pool %d requested work restart", + work->pool->pool_no); work_block++; restart_threads(); }