Browse Source

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.

Con Kolivas 14 years ago
parent
commit
628ac19977
2 changed files with 13 additions and 6 deletions
  1. 8 2
      NEWS
  2. 5 4
      cgminer.c

+ 8 - 2
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.
 - Small cosmetic output alignment.
 - Add pool number to stale share message.
 - Add pool number to stale share message.
 - Add space to log output now that there is more screen real estate available.
 - Add space to log output now that there is more screen real estate available.

+ 5 - 4
cgminer.c

@@ -2376,18 +2376,19 @@ static void test_work_current(struct work *work)
 		work_block++;
 		work_block++;
 
 
 		if (work->longpoll) {
 		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->pool->pool_no);
 			work->longpoll = false;
 			work->longpoll = false;
 		} else if (have_longpoll)
 		} 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
 		else
-			applog(LOG_NOTICE, "New block detected on network, waiting on fresh work");
+			applog(LOG_NOTICE, "New block detected on network");
 		restart_threads();
 		restart_threads();
 	} else if (work->longpoll) {
 	} else if (work->longpoll) {
 		work->longpoll = false;
 		work->longpoll = false;
 		if (work->pool == current_pool()) {
 		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++;
 			work_block++;
 			restart_threads();
 			restart_threads();
 		}
 		}