From 5464f4a6a9e0250b180e90df16696daa46c7d078 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 7 Jan 2020 17:31:13 -0500
Subject: [PATCH] improve logging

---
 .../java/bubble/service/boot/StandardSelfNodeService.java    | 5 ++++-
 utils/cobbzilla-utils                                        | 2 +-
 utils/cobbzilla-wizard                                       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
index 45380e6d..5698adde 100644
--- a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
+++ b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
@@ -20,6 +20,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.cobbzilla.util.cache.Refreshable;
 import org.cobbzilla.util.string.StringUtil;
+import org.cobbzilla.util.system.OneWayFlag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -140,6 +141,8 @@ public class StandardSelfNodeService implements SelfNodeService {
         }
     }
 
+    private OneWayFlag nullWarningPrinted = new OneWayFlag("nullWarningPrinted");
+
     public BubbleNode getThisNode () {
         synchronized (thisNode) {
             final BubbleNode self = thisNode.get();
@@ -151,7 +154,7 @@ public class StandardSelfNodeService implements SelfNodeService {
                 log.debug("getThisNode: setting thisNode="+initSelf.id());
                 thisNode.set(initSelf);
                 if (initSelf == NULL_NODE) {
-                    log.warn("getThisNode: initThisNode returned NULL_NODE");
+                    if (!nullWarningPrinted.check()) log.warn("getThisNode: initThisNode returned NULL_NODE");
                     return null;
                 }
                 if (wasRestored.get()) {
diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils
index 4f62fa3e..cd855011 160000
--- a/utils/cobbzilla-utils
+++ b/utils/cobbzilla-utils
@@ -1 +1 @@
-Subproject commit 4f62fa3e49dd90282d48860cf60a46e51a3f6aa0
+Subproject commit cd855011075d65a7e2f0c2ecf3cbaefa5fd57b15
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 97469af0..7a2ee8f8 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 97469af03d871cb39168f3d6f20b56b495b5ccdb
+Subproject commit 7a2ee8f8268d135177a83132ccf9f9833bc61fd1