[pulsar] branch master updated: [fix][cli] Pulsar shell: do not exit on user interrupt during commands (#18615)

[nicoloboschi]

This is an automated email from the ASF dual-hosted git repository.

nicoloboschi 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 43da8b90ff7 [fix][cli] Pulsar shell: do not exit on user interrupt 
during commands (#18615)
43da8b90ff7 is described below

commit 43da8b90ff7ca475b7335166a4b1378c8554edc4
Author: Nicolò Boschi <boschi1...@gmail.com>
AuthorDate: Fri Nov 25 14:30:29 2022 +0100

    [fix][cli] Pulsar shell: do not exit on user interrupt during commands 
(#18615)
---
 .../java/org/apache/pulsar/shell/PulsarShell.java  | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
index b12ed5577a6..257e00fd142 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
@@ -122,6 +122,10 @@ public class PulsarShell {
         boolean noProgress;
     }
 
+    enum ExecState {
+        IDLE,
+        RUNNING
+    }
     private Properties properties;
     @Getter
     private final ConfigStore configStore;
@@ -132,6 +136,7 @@ public class PulsarShell {
     private Function<Map<String, ShellCommandsProvider>, 
InteractiveLineReader> readerBuilder;
     private InteractiveLineReader reader;
     private final ConfigShell configShell;
+    private ExecState execState = ExecState.IDLE;
 
     public PulsarShell(String args[]) throws IOException {
         this(args, new Properties());
@@ -217,7 +222,18 @@ public class PulsarShell {
     }
 
     public void run() throws Exception {
-        final Terminal terminal = TerminalBuilder.builder().build();
+        final Terminal terminal = TerminalBuilder.builder()
+                .nativeSignals(true)
+                .signalHandler(signal -> {
+                    if (signal == Terminal.Signal.INT || signal == 
Terminal.Signal.QUIT) {
+                        if (execState == ExecState.RUNNING) {
+                            throw new InterruptShellException();
+                        } else {
+                            exit(0);
+                        }
+                    }
+                })
+                .build();
         run((providersMap) -> {
             List<Completer> completers = new ArrayList<>();
             String serviceUrl = "";
@@ -404,6 +420,7 @@ public class PulsarShell {
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> quit(terminal)));
         while (true) {
+            execState = ExecState.IDLE;
             final List<String> words;
             try {
                 words = commandReader.readCommand();
@@ -411,6 +428,7 @@ public class PulsarShell {
                 exit(0);
                 return;
             }
+            execState = ExecState.RUNNING;
             final String line = words.stream().collect(Collectors.joining(" 
"));
             if (StringUtils.isBlank(line)) {
                 continue;
@@ -434,6 +452,8 @@ public class PulsarShell {
             try {
                 printExecutingCommands(terminal, commandsInfo, false);
                 commandOk = pulsarShellCommandsProvider.runCommand(argv);
+            } catch (InterruptShellException t) {
+                // no-op
             } catch (Throwable t) {
                 t.printStackTrace(terminal.writer());
             } finally {