connect: allow to disconnect by Ctrl+C/Ctrl+\ if execution hung

CHANGELOG.md

@@ -9,12 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- `tt pack `: added TCM file packaging.
-- `tt aeon connect`: add connection from the cluster config.
 - `tt aeon connect`: add connection from the `app:insance_name`.
 
 ### Changed
 
+- `tt connect`: allow to disconnect with `Ctrl+C` or `Ctrl+\` if script execution hung.
+
 ### Fixed
 
 - `tt connect`: return Lua parse error.

cli/connect/console.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/signal"
 	"sort"
 	"strings"
 	"syscall"
@@ -276,7 +277,27 @@ func getExecutor(console *Console, connectCtx ConnectCtx) (func(string), error)
 		console.livePrefixEnabled = false
 	}
 
-	return executor, nil
+	signalable_executor := func(in string) {
+		// Signal handler.
+		handleSignals := func(console *Console, stop chan struct{}) {
+			sig := make(chan os.Signal, 1)
+			signal.Notify(sig, syscall.SIGINT, syscall.SIGQUIT)
+			select {
+			case <-stop:
+				return
+			case <-sig:
+				console.Close()
+				os.Exit(0)
+			}
+		}
+
+		stop := make(chan struct{})
+		go handleSignals(console, stop)
+		executor(in)
+		stop <- struct{}{}
+	}
+
+	return signalable_executor, nil
 }
 
 func getCompleter(console *Console, connectCtx ConnectCtx) prompt.Completer {

test/integration/connect/test_connect.py

@@ -3,6 +3,7 @@
 import platform
 import re
 import shutil
+import signal
 import subprocess
 import tempfile
 from pathlib import Path
@@ -15,7 +16,7 @@
                    run_command_and_get_output, run_path,
                    skip_if_cluster_app_unsupported, skip_if_quit_unsupported,
                    skip_if_tarantool_ce, skip_if_tuple_format_supported,
-                   skip_if_tuple_format_unsupported, wait_file)
+                   skip_if_tuple_format_unsupported, wait_file, wait_files)
 
 tarantool_major_version, tarantool_minor_version = get_tarantool_version()
 
@@ -3136,3 +3137,33 @@ def test_custom_evaler_errors(tt_cmd, tmpdir_with_cfg):
 
     finally:
         stop_app(tt_cmd, tmpdir, "test_app")
+
+
+@pytest.mark.tt(app_path='test_single_app/test_app.lua')
+@pytest.mark.parametrize('sig', [
+    pytest.param(signal.SIGINT, id='SIGINT'),
+    pytest.param(signal.SIGQUIT, id='SIGQUIT'),
+])
+def test_disconnect_by_signal(tt, sig):
+    # Start an instance.
+    tt.exec("start", "test_app")
+    # Check for start.
+    assert wait_files(5, [tt.path('configured')])
+
+    p = tt.popen("connect", "test_app",
+                 stdin=subprocess.PIPE,
+                 stdout=subprocess.PIPE,
+                 stderr=subprocess.PIPE,
+                 universal_newlines=True)
+
+    try:
+        p.communicate("while true do end", 2)
+        # Should not reach this code.
+        assert False
+    except subprocess.TimeoutExpired:
+        p.send_signal(sig)
+
+    assert p.wait(1) is not None
+
+    # Make sure the instance is stopped.
+    tt.exec("kill", "-f", "test_app")

test/tt_helper.py

@@ -1,4 +1,5 @@
 import os
+import subprocess
 
 import utils
 
@@ -39,8 +40,16 @@ def is_instance_of(inst, *targets):
     def exec(self, *args, **kwargs):
         args = list(filter(lambda x: x is not None, args))
         cmd = [self.__tt_cmd, *args]
-        input = kwargs.get('input')
-        return utils.run_command_and_get_output(cmd, cwd=self.__work_dir, input=input)
+        tt_kwargs = dict(cwd=self.__work_dir)
+        tt_kwargs.update(kwargs)
+        return utils.run_command_and_get_output(cmd, **tt_kwargs)
+
+    def popen(self, *args, **kwargs):
+        args = list(filter(lambda x: x is not None, args))
+        cmd = [self.__tt_cmd, *args]
+        tt_kwargs = dict(cwd=self.__work_dir)
+        tt_kwargs.update(kwargs)
+        return subprocess.Popen(cmd, **tt_kwargs)
 
     def path(self, *paths):
         return os.path.join(self.__work_dir, *paths)