From 3d176b09d1f2f9795b36bf7933478861949daea6 Mon Sep 17 00:00:00 2001
From: yeti <yeti@alps>
Date: Fri, 18 Apr 2025 02:56:25 +0100
Subject: [PATCH] feat(ssh): improve the flow of logs and improve session
 management

---
 ssh_router.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ssh_router.sh b/ssh_router.sh
index 1587376..32aecf8 100755
--- a/ssh_router.sh
+++ b/ssh_router.sh
@@ -60,29 +60,30 @@ rw)
 
   # Run $TMUX_CMD session inside the container
   if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" has-session -t "$TMUX_SESSION" >/dev/null 2>&1; then
-    if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" new-session -s "$TMUX_SESSION" >/dev/null 2>&1; then
+    if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" new-session -d -s "$TMUX_SESSION" >/dev/null 2>&1; then
       log "❌ Could not create new ${TMUX_CMD[*]} session. Please contact admin or try again later."
       exit 1
     fi
-  else
-    log "⚡ $PERSON is logging in..."
-    if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" attach -t "$TMUX_SESSION"; then
-      log "❌ Could not attach to ${TMUX_CMD[*]} session. Please contact admin or try again later."
-      exit 1
-    fi
   fi
 
+  log "⚡ $PERSON is working on $CONTAINER"
+  if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" attach -t "$TMUX_SESSION"; then
+    log "❌ Could not attach to ${TMUX_CMD[*]} session. Please contact admin or try again later."
+    exit 1
+  fi
+  log "⚡ $PERSON finished working on $CONTAINER"
+
   check_devuser_attached
   exit 0
   ;;
 ro)
   if (podman container exists "$CONTAINER" && podman inspect -f '{{.State.Running}}' "$CONTAINER" | grep -q true) >/dev/null 2>&1; then
-    log "📜 $PERSON is viewing..."
-    if podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" attach -r -t "$TMUX_SESSION"; then
+    log "📜 $PERSON is viewing $CONTAINER"
+    if ! podman exec -it --user "$DEV_USER" "$CONTAINER" "${TMUX_CMD[@]}" attach -r -t "$TMUX_SESSION"; then
       log "❌ Could not attach to ${TMUX_CMD[*]} session. Please contact admin or try again later."
       exit 1
     fi
-    log "🏃 $PERSON stopped viewing..."
+    log "🏃 $PERSON stopped viewing $CONTAINER"
     exit 0
   else
     log "❌ Container $CONTAINER does not exist."