diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-12-15 14:24:34 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-12-15 14:24:34 +0100 |
commit | 160304616eb4d3c6b0a227b5ec8c7965a7d51e0f (patch) | |
tree | 6a7772d57c963319024efcaff6adb2fbf368460f /zookeeper-server | |
parent | f5ba48c4110dcc3b73154c7e9c014f479b795a88 (diff) |
Use Process.logAndDie
Diffstat (limited to 'zookeeper-server')
2 files changed, 4 insertions, 12 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index 61951391f89..2eff37a1b4c 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java @@ -1,14 +1,13 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.protect.Process; import org.apache.zookeeper.server.admin.AdminServer; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.apache.zookeeper.server.quorum.QuorumPeerMain; import java.io.IOException; import java.nio.file.Path; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Starts/stops a ZooKeeper server. Extends QuorumPeerMain to be able to call initializeAndRun() and wraps @@ -18,8 +17,6 @@ import java.util.logging.Logger; */ class VespaQuorumPeer extends QuorumPeerMain { - private static final Logger LOG = Logger.getLogger(VespaQuorumPeer.class.getName()); - public void start(Path path) { initializeAndRun(new String[]{ path.toFile().getAbsolutePath()}); } @@ -35,8 +32,7 @@ class VespaQuorumPeer extends QuorumPeerMain { // server with the new config, this will fail until the old server is deconstructed. If the old server // fails to deconstruct/shut down, the new one will never start and if that happens forcing a restart is // the better option. - LOG.log(Level.SEVERE, "Failed to shut down properly, forcing restart", e); - System.exit(1); + Process.logAndDie("Failed to shut down ZooKeeper properly, forcing shutdown", e); } } } diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index 61951391f89..2eff37a1b4c 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java @@ -1,14 +1,13 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.protect.Process; import org.apache.zookeeper.server.admin.AdminServer; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.apache.zookeeper.server.quorum.QuorumPeerMain; import java.io.IOException; import java.nio.file.Path; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Starts/stops a ZooKeeper server. Extends QuorumPeerMain to be able to call initializeAndRun() and wraps @@ -18,8 +17,6 @@ import java.util.logging.Logger; */ class VespaQuorumPeer extends QuorumPeerMain { - private static final Logger LOG = Logger.getLogger(VespaQuorumPeer.class.getName()); - public void start(Path path) { initializeAndRun(new String[]{ path.toFile().getAbsolutePath()}); } @@ -35,8 +32,7 @@ class VespaQuorumPeer extends QuorumPeerMain { // server with the new config, this will fail until the old server is deconstructed. If the old server // fails to deconstruct/shut down, the new one will never start and if that happens forcing a restart is // the better option. - LOG.log(Level.SEVERE, "Failed to shut down properly, forcing restart", e); - System.exit(1); + Process.logAndDie("Failed to shut down ZooKeeper properly, forcing shutdown", e); } } } |