From e4caf08affb0f6643041aa70fddd7fecc766a60a Mon Sep 17 00:00:00 2001
From: mirabilos <t.glaser@tarent.de>
Date: Thu, 9 Nov 2023 00:27:39 +0100
Subject: [PATCH] add devattach.sh for convenience

---
 .gitignore   |  1 +
 DEVNOTES     |  8 ++++++++
 devattach.sh | 23 +++++++++++++++++++++++
 mrun.sh      |  3 +++
 run.sh       |  3 +++
 5 files changed, 38 insertions(+)
 create mode 100644 .gitignore
 create mode 100755 devattach.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..07ed473
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pid
diff --git a/DEVNOTES b/DEVNOTES
index 7c2be63..7061928 100644
--- a/DEVNOTES
+++ b/DEVNOTES
@@ -10,13 +10,21 @@ Attach to a running instance:
 2. Attach another server on a different port, when code-testing:
 
 	$ </proc/30837/environ xargs -0 mksh -c 'exec env "$@" ./run-produce.sh 8083' --
+	 # or (new)
+	$ ./devattach.sh ./run-produce.sh 8083
 
 3. Attach a PostgreSQL client:
 
 	$ </proc/30837/environ xargs -0o mksh -c 'exec env "$@" psql' --
+	 # or (new)
+	$ ./devattach.sh
 
 4. If needed, enable statement logging:
 
 	postgres=# ALTER SYSTEM SET log_statement TO 'all';
 	postgres=# SELECT pg_reload_conf();
 	$ tail -F /tmp/pg_virtualenv.*/log/postgresql-*-regress.log
+
+5. Enter the session
+
+	postgres=# SELECT jensjs.use_session(1);
diff --git a/devattach.sh b/devattach.sh
new file mode 100755
index 0000000..1424307
--- /dev/null
+++ b/devattach.sh
@@ -0,0 +1,23 @@
+#!/bin/mksh
+
+set -e
+
+if (( $# == 0 )); then
+	# as default command
+	set -- psql
+	# as hint
+	print -ru2 '# SELECT jensjs.use_session(1);'
+fi
+
+devattach_sh_mydir=$(realpath "$0/..")
+if [[ ! -s $devattach_sh_mydir/.pid ]]; then
+	print -ru2 E: cannot find pidfile
+	exit 1
+fi
+devattach_sh_pid=$(<"$devattach_sh_mydir/.pid")
+
+devattach_sh_cmd='exec env "$@"'
+for devattach_sh_x in "$@"; do
+	devattach_sh_cmd+=\ ${devattach_sh_x@Q}
+done
+exec </proc/"$devattach_sh_pid"/environ xargs -0o mksh -c "$devattach_sh_cmd" --
diff --git a/mrun.sh b/mrun.sh
index 8d4cd87..f684f6a 100755
--- a/mrun.sh
+++ b/mrun.sh
@@ -131,6 +131,7 @@ set -A jdpids
 function cleanup {
 	print -ru2 -- I: mrun.sh: cleaning up
 	trap - EXIT
+	rm -f .pid
 	[[ -z $pypid ]] || xsendsig "$pypid" -INT
 	[[ -z $shpid ]] || for p in "${shpid[@]}"; do
 		xsendsig "$p" -INT
@@ -143,6 +144,8 @@ function cleanup {
 trap 'cleanup 0' INT
 trap 'cleanup 1' EXIT TERM
 
+echo $$ >.pid
+
 # run python subprocess produce
 {
 	trap - EXIT
diff --git a/run.sh b/run.sh
index f7a1dbb..3cd0ab5 100755
--- a/run.sh
+++ b/run.sh
@@ -84,6 +84,7 @@ shpid=
 function cleanup {
 	print -ru2 -- I: run.sh: cleaning up
 	trap - EXIT
+	rm -f .pid
 	[[ -z $pypid ]] || xsendsig "$pypid" -INT
 	[[ -z $shpid ]] || xsendsig "$shpid" -INT
 	exit "$1"
@@ -91,6 +92,8 @@ function cleanup {
 trap 'cleanup 0' INT
 trap 'cleanup 1' EXIT TERM
 
+echo $$ >.pid
+
 # run python subprocess produce
 {
 	trap - EXIT