You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2019/06/10 01:53:52 UTC
[pulsar] branch master updated: Fix issue for incorrect log
parameters (#4409)
This is an automated email from the ASF dual-hosted git repository.
sijie 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 af88a36 Fix issue for incorrect log parameters (#4409)
af88a36 is described below
commit af88a360df72b5fde221fe183ecbc9e13a4c578d
Author: hapihu <zh...@gmail.com>
AuthorDate: Mon Jun 10 09:53:46 2019 +0800
Fix issue for incorrect log parameters (#4409)
Fix issue for incorrect log parameters
* When calling Logger's method, set the appropriate parameters
* Fix #4408.
---
.../java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java | 2 +-
.../src/main/java/org/apache/pulsar/broker/service/ServerCnx.java | 2 +-
.../java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java | 4 ++--
.../src/main/java/org/apache/pulsar/common/naming/NamespaceName.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
index b8eda01..c01938f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
@@ -162,7 +162,7 @@ public class NonPersistentTopics extends PersistentTopics {
@ApiResponse(code = 404, message = "Namespace doesn't exist") })
public List<String> getList(@PathParam("property") String property, @PathParam("cluster") String cluster,
@PathParam("namespace") String namespace) {
- log.info("[{}] list of topics on namespace {}/{}/{}/{}", clientAppId(), property, cluster, namespace);
+ log.info("[{}] list of topics on namespace {}/{}/{}", clientAppId(), property, cluster, namespace);
validateAdminAccessForTenant(property);
Policies policies = getNamespacePolicies(property, cluster, namespace);
NamespaceName nsName = NamespaceName.get(property, cluster, namespace);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 027d674..a29c9a4 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -1312,7 +1312,7 @@ public class ServerCnx extends PulsarHandler {
ctx.writeAndFlush(Commands.newGetTopicsOfNamespaceResponse(topics, requestId));
} catch (Exception e) {
- log.warn("[{]] Error GetTopicsOfNamespace for namespace [//{}] by {}",
+ log.warn("[{}] Error GetTopicsOfNamespace for namespace [//{}] by {}",
remoteAddress, namespace, requestId);
ctx.writeAndFlush(
Commands.newError(requestId,
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
index 312c1cd..f2f0c35 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
@@ -176,7 +176,7 @@ public class MultiTopicsConsumerImpl<T> extends ConsumerBase<T> {
// - topic names are unique.
private static boolean topicNamesValid(Collection<String> topics) {
checkState(topics != null && topics.size() >= 1,
- "topics should should contain more than 1 topic");
+ "topics should contain more than 1 topic");
final String namespace = TopicName.get(topics.stream().findFirst().get()).getNamespace();
@@ -196,7 +196,7 @@ public class MultiTopicsConsumerImpl<T> extends ConsumerBase<T> {
}).findFirst();
if (result.isPresent()) {
- log.warn("[{}] Received invalid topic name. {}/{}", result.get());
+ log.warn("Received invalid topic name: {}", result.get());
return false;
}
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
index 66a4210..485a498 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
@@ -175,7 +175,7 @@ public class NamespaceName implements ServiceUnitId {
NamedEntity.checkName(namespace);
} catch (NullPointerException e) {
throw new IllegalArgumentException(
- String.format("Invalid namespace format. namespace: %s/%s/%s", tenant, namespace), e);
+ String.format("Invalid namespace format. namespace: %s/%s", tenant, namespace), e);
}
}