You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/04/13 14:25:16 UTC
[pulsar] branch master updated: Fix exit when qureystate and
specify watch (#4033)
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 c855c9c Fix exit when qureystate and specify watch (#4033)
c855c9c is described below
commit c855c9c7205f4153c07417a7dfb836bef97ac375
Author: Yong Zhang <zh...@gmail.com>
AuthorDate: Sat Apr 13 22:25:11 2019 +0800
Fix exit when qureystate and specify watch (#4033)
* Fix exit when qureystate and specify watched
---
*Motivation*
It's shouldn't exit when querystate and specify watched. When watched specify, it
watch all changes.
*Modifications*
Add `catch` for watch, When server return NOT_FOUND and user was watched it still watch
all changes.
* Remove unused imports
* Fix output type
---
.../java/org/apache/pulsar/admin/cli/CmdFunctions.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index feca138..8fb3e22 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -46,6 +46,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.pulsar.admin.cli.utils.CmdUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.common.functions.FunctionConfig;
import org.apache.pulsar.common.functions.Resources;
@@ -778,9 +779,18 @@ public class CmdFunctions extends CmdBase {
@Override
void runCmd() throws Exception {
do {
- FunctionState functionState = admin.functions().getFunctionState(tenant, namespace, functionName, key);
- Gson gson = new GsonBuilder().setPrettyPrinting().create();
- System.out.println(gson.toJson(functionState));
+ try {
+ FunctionState functionState = admin.functions()
+ .getFunctionState(tenant, namespace, functionName, key);
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ gson.toJson(functionState);
+ } catch (PulsarAdminException pae) {
+ if (pae.getStatusCode() == 404 && watch) {
+ System.err.println(pae.getMessage());
+ } else {
+ throw pae;
+ }
+ }
if (watch) {
Thread.sleep(1000);
}