diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-04-25 23:26:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 23:26:04 +0200 |
| commit | 60ba575d5bf7af60d83e058a6f6f54486675b636 (patch) | |
| tree | 765959014880c429042d75736a26b83700b0ebcf | |
| parent | 094c8a5bb66f5f7a3b38cda0e6298a078691860f (diff) | |
| parent | 90c75a7351010e77a3a510dbdf043189ac4c9b7d (diff) | |
Merge pull request #22259 from vespa-engine/hmusum/avoid-logging-error-when-client-exits
Avoid logging error when client exits
| -rw-r--r-- | zookeeper-command-line-client/pom.xml | 6 | ||||
| -rw-r--r-- | zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 236bd5245a9..5dfc5ab22be 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -66,7 +66,11 @@ <artifactId>snappy-java</artifactId> <scope>compile</scope> </dependency> - + <dependency> + <!-- Needed by zookeeper, which only has an optional dependency. --> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java index 7f7965f82eb..e10404cf2c7 100644 --- a/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java +++ b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java @@ -3,8 +3,8 @@ package com.yahoo.vespa.zookeeper.cli; import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder; import org.apache.zookeeper.ZooKeeperMain; +import org.apache.zookeeper.util.ServiceUtils; import org.slf4j.impl.SimpleLogger; - import java.io.IOException; /** @@ -20,6 +20,7 @@ public class Main { new ZkClientConfigBuilder() .toConfigProperties() .forEach(System::setProperty); + ServiceUtils.setSystemExitProcedure(System::exit); ZooKeeperMain.main(args); } } |