[brooklyn-server] 07/27: fix typos, and tidy-up MDC logging in case of leaks (not sure it happens but be safe)

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit cc0ec89496aded36f8f059528bc621284dea303f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Sep 13 22:51:07 2021 +0100

    fix typos, and tidy-up MDC logging in case of leaks (not sure it happens but be safe)
---
 .../java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 5 +++--
 .../org/apache/brooklyn/util/core/task/BasicExecutionManager.java    | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
index 8f6d6af..57395c7 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
@@ -114,7 +114,8 @@ public class RebindManagerImpl implements RebindManager {
     public static final Logger LOG = LoggerFactory.getLogger(RebindManagerImpl.class);
 
     private final ManagementContextInternal managementContext;
-    
+
+    // TODO separate times for persist and read-only rebind, allow configurable, default at least for RO rebind larger
     private volatile Duration periodicPersistPeriod = Duration.ONE_SECOND;
     
     private volatile boolean persistenceRunning = false;
@@ -340,7 +341,7 @@ public class RebindManagerImpl implements RebindManager {
         
         Callable<Task<?>> taskFactory = new Callable<Task<?>>() {
             @Override public Task<Void> call() {
-                return Tasks.<Void>builder().dynamic(false).displayName("rebind (periodic run").body(new Callable<Void>() {
+                return Tasks.<Void>builder().dynamic(false).displayName("rebind (periodic run)").body(new Callable<Void>() {
                     @Override
                     public Void call() {
                         try {
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
index 706edeb..487b155 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
@@ -163,9 +163,12 @@ public class BasicExecutionManager implements ExecutionManager {
                 }
                 taskMdc = MDC.putCloseable(LOGGING_MDC_KEY_TASK_ID, task.getId());
             }
+            prevEntityMdc = MDC.get(LOGGING_MDC_KEY_ENTITY_IDS);
             if (entity != null) {
-                prevEntityMdc = MDC.get(LOGGING_MDC_KEY_ENTITY_IDS);
                 entityMdc = MDC.putCloseable(LOGGING_MDC_KEY_ENTITY_IDS, "[" + entity.getApplicationId() + "," + entity.getId() + "]");
+            } else if (prevTaskMdc != null) {
+                // just in case some MDC logger leaked, make it explicit there is no entity here
+                entityMdc = MDC.putCloseable(LOGGING_MDC_KEY_ENTITY_IDS, "");
             }
 
             if (BrooklynLoggingCategories.TASK_LIFECYCLE_LOG.isDebugEnabled() || BrooklynLoggingCategories.TASK_LIFECYCLE_LOG.isTraceEnabled()) {