Commit 628ac199771ba607d5c75e0def9c302dd7a5d51e
2012-04-28T14:00:34
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/NEWS b/NEWS
index 499b0e7..fcaeb20 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 b016114..ef13b0d 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();
}