From bce44cbf274b8a8241ce183ba21e50fd6105a90b Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 4 Jul 2020 08:43:26 -0400 Subject: [PATCH] log/meter tweaks --- .../java/bubble/service/cloud/StandardNetworkService.java | 4 ++-- .../src/main/resources/bubble/node_progress_meter_ticks.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java index f6be505a..6fe69ab8 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java @@ -362,7 +362,7 @@ public class StandardNetworkService implements NetworkService { int i = 1; while (now() - readyStart < NODE_READY_TIMEOUT) { sleep(SECONDS.toMillis(2), "newNode: waiting for node (" + node.id() + ") to be ready"); - log.info("newNode: waiting for node (" + node.id() + ") to be ready via "+readyUri); + log.debug("newNode: waiting for node (" + node.id() + ") to be ready via "+readyUri); progressMeter.write("READY-CHECK-"+(i++)+" /auth/ready for node: "+node.id()); launchMonitor.touch(network.getUuid()); try { @@ -372,7 +372,7 @@ public class StandardNetworkService implements NetworkService { ready = true; break; } else { - log.info("newNode: waiting for node (" + node.id() + ") /auth/ready call failed: "+readyResponse.getStatus()); + log.debug("newNode: waiting for node (" + node.id() + ") /auth/ready call failed: "+readyResponse.getStatus()); } } catch (Exception e) { log.warn("newNode: node (" + node.id() + ") error checking if ready: " + shortError(e)); diff --git a/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json b/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json index 7e9f7c6a..e23a6a8b 100644 --- a/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json +++ b/bubble-server/src/main/resources/bubble/node_progress_meter_ticks.json @@ -39,6 +39,6 @@ { "percent": 95,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-1" }, { "percent": 96,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-7" }, { "percent": 97,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-13" }, -{ "percent": 98,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-20" }, -{ "percent": 99,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-26" } +{ "percent": 98,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-19" }, +{ "percent": 99,"messageKey":"ready_check", "match": "prefix", "pattern":"READY-CHECK-25" } ]