[pulsar] branch master updated: [pulsar-broker] When calling Logger's method, set the appropriate parameters.(#4350) (#4351)

[mm...@apache.org]

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

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 27eb5ca  [pulsar-broker] When calling Logger's method, set the appropriate parameters.(#4350) (#4351)
27eb5ca is described below

commit 27eb5cac48a52c69966a68e8391ba3d4b9e3f98f
Author: hapihu <w....@qq.com>
AuthorDate: Sat May 25 05:27:48 2019 +0800

    [pulsar-broker] When calling Logger's method, set the appropriate parameters.(#4350) (#4351)
---
 .../main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java | 2 +-
 .../java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java    | 6 +++---
 .../main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
index b65d268..867d2f5 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
@@ -370,7 +370,7 @@ public class ClustersBase extends AdminResource {
                             "NamespaceIsolationPolicies for cluster " + cluster + " does not exist"));
             // construct the response to Namespace isolation data map
             if (!nsIsolationPolicies.getPolicies().containsKey(policyName)) {
-                log.info("[{}] Cannot find NamespaceIsolationPolicy {} for cluster {}", policyName, cluster);
+                log.info("[{}] Cannot find NamespaceIsolationPolicy {} for cluster {}", clientAppId(), policyName, cluster);
                 throw new RestException(Status.NOT_FOUND,
                         "Cannot find NamespaceIsolationPolicy " + policyName + " for cluster " + cluster);
             }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index eab5cd9..bc56bb8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -574,7 +574,7 @@ public abstract class NamespacesBase extends AdminResource {
             }
         }
 
-        log.info("[{}] Successfully unloaded all the bundles in namespace {}/{}/{}", clientAppId(), namespaceName);
+        log.info("[{}] Successfully unloaded all the bundles in namespace {}", clientAppId(), namespaceName);
     }
 
     @SuppressWarnings("deprecation")
@@ -1217,13 +1217,13 @@ public abstract class NamespacesBase extends AdminResource {
                     namespaceName);
             throw new RestException(Status.NOT_FOUND, "Namespace does not exist");
         } catch (KeeperException.BadVersionException e) {
-            log.warn("[{}] Failed to update subscription auth mode for namespace {}/{}/{}: concurrent modification",
+            log.warn("[{}] Failed to update subscription auth mode for namespace {}: concurrent modification",
                     clientAppId(), namespaceName);
             throw new RestException(Status.CONFLICT, "Concurrent modification");
         } catch (RestException pfe) {
             throw pfe;
         } catch (Exception e) {
-            log.error("[{}] Failed to update subscription auth mode for namespace {}/{}/{}", clientAppId(),
+            log.error("[{}] Failed to update subscription auth mode for namespace {}", clientAppId(),
                     namespaceName, e);
             throw new RestException(e);
         }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java
index 6a9dc38..094e78b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java
@@ -143,7 +143,7 @@ public interface LoadManager {
                 return casted;
             }
         } catch (Exception e) {
-            log.warn("Error when trying to create load manager: {}");
+            log.warn("Error when trying to create load manager: ", e);
         }
         // If we failed to create a load manager, default to SimpleLoadManagerImpl.
         return new SimpleLoadManagerImpl(pulsar);