Skip to content

ZOOKEEPER-5021: Exit from zkCli when interrupt (Ctrl-C) or EOF (Ctrl-D) is pressed #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PDavid wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

ZOOKEEPER-5021: Exit from zkCli when interrupt (Ctrl-C) or EOF (Ctrl-D) is pressed #2357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,13 @@ void run() throws IOException, InterruptedException {

boolean jlinemissing = false;
// only use jline if it's in the classpath
Class<?> endOfFileExceptionC = null;
Class<?> userInterruptExceptionC = null;
try {
Class<?> readerC = Class.forName("org.jline.reader.LineReader");
Class<?> completerC = Class.forName("org.apache.zookeeper.JLineZNodeCompleter");
endOfFileExceptionC = Class.forName("org.jline.reader.EndOfFileException");
userInterruptExceptionC = Class.forName("org.jline.reader.UserInterruptException");

System.out.println("JLine support is enabled");

Expand All @@ -331,8 +335,15 @@ void run() throws IOException, InterruptedException {
| IllegalAccessException
| InstantiationException e
) {
LOG.debug("Unable to start jline", e);
jlinemissing = true;
// Only fall back to terminal without JLine when user not interrupted (Ctrl-C)
// or does not want to exit (Ctrl-D / EOF).
Throwable cause = e.getCause();
boolean isEof = cause != null && cause.getClass().equals(endOfFileExceptionC);
boolean isUserInterrupted = cause != null && cause.getClass().equals(userInterruptExceptionC);
if (!(isEof || isUserInterrupted)) {
LOG.debug("Unable to start jline", e);
jlinemissing = true;
}
}

if (jlinemissing) {
Expand Down