feat: dev-tools, ensure deamonized commands stay within process

scripts/dev-tools/dev-tools

@@ -38,11 +38,11 b' dev_tools_usage() {'
   printf "  %s   run bash console for rhodecode-ce\n" "ce                 "
   printf "  %s   run bash console for rhodecode-ee\n" "ee                 "
   printf "  %s   run bash console for rhodecode-celery\n" "celery             "
-  printf "  %s   run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n" "celeryd            "
+  printf "  %s   run celery detached instance on top of mounted source code\n" "celeryd            "
   printf "  %s   run bash console for rhodecode-ssh\n" "ssh                "
-  printf "  %s   run sshd instance for rhodecode-ssh\n" "sshd               "
+  printf "  %s   run sshd detached instance on top of mounted source code\n" "sshd               "
   printf "  %s   run bash console for rhodecode-ssh\n" "svn                "
-  printf "  %s   run sshd instance for rhodecode-ssh\n" "svnd               "
+  printf "  %s   run svn detached instance on top of mounted source code\n" "svnd               "
   printf "  %s   run bash console for rhodecode-tools-ce\n" "tools              "
   printf "  %s   create dev env required to run vcsserver and rhodecode\n" "dev-env            "
   printf "  %s   stops dev env\n" "dev-env-stop       "
@@ -280,11 +280,11 b' dev_tools_celery_usage() {'
 # :command.usage
 dev_tools_celeryd_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    printf "dev-tools celeryd - run celery detached instance on top of mounted source code\n"
     echo
 
   else
-    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    printf "dev-tools celeryd - run celery detached instance on top of mounted source code\n"
     echo
 
   fi
@@ -311,6 +311,11 b' dev_tools_celeryd_usage() {'
     printf "    Default: .dev-env/cmd-celeryd.sh\n"
     echo
 
+    # :flag.usage
+    printf "  %s\n" "--force-cmd"
+    printf "    enforce re-creation of the startup command\n"
+    echo
+
     # :command.usage_fixed_flags
     printf "  %s\n" "--help, -h"
     printf "    Show this help\n"
@@ -364,11 +369,11 b' dev_tools_ssh_usage() {'
 # :command.usage
 dev_tools_sshd_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools sshd - run sshd detached instance on top of mounted source code\n"
     echo
 
   else
-    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools sshd - run sshd detached instance on top of mounted source code\n"
     echo
 
   fi
@@ -395,6 +400,11 b' dev_tools_sshd_usage() {'
     printf "    Default: .dev-env/cmd-sshd.sh\n"
     echo
 
+    # :flag.usage
+    printf "  %s\n" "--force-cmd"
+    printf "    enforce re-creation of the startup command\n"
+    echo
+
     # :command.usage_fixed_flags
     printf "  %s\n" "--help, -h"
     printf "    Show this help\n"
@@ -448,11 +458,11 b' dev_tools_svn_usage() {'
 # :command.usage
 dev_tools_svnd_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools svnd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools svnd - run svn detached instance on top of mounted source code\n"
     echo
 
   else
-    printf "dev-tools svnd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools svnd - run svn detached instance on top of mounted source code\n"
     echo
 
   fi
@@ -479,6 +489,11 b' dev_tools_svnd_usage() {'
     printf "    Default: .dev-env/cmd-svnd.sh\n"
     echo
 
+    # :flag.usage
+    printf "  %s\n" "--force-cmd"
+    printf "    enforce re-creation of the startup command\n"
+    echo
+
     # :command.usage_fixed_flags
     printf "  %s\n" "--help, -h"
     printf "    Show this help\n"
@@ -1344,6 +1359,7 b' dev_tools_celeryd_command() {'
 
   code_workdir=${args[--workdir]}
   cmd_script=${args[--cmd]}
+  force_cmd=${args[--force-cmd]}
 
   exec_script=$WORKSPACE_HOME/$cmd_script
   container_name=dev-celeryd
@@ -1353,14 +1369,15 b' dev_tools_celeryd_command() {'
 
   RC_DEV_CMD_HELP=""
 
-  if [[ ! -f $exec_script ]]; then
+  if [[ ! -f $exec_script || $force_cmd ]]; then
     echo "Generating new $exec_script file..."
     mkdir -p $(dirname $exec_script)
 
     cat <<< "
+  #!/bin/bash
   # Generated dev-env script for celeryd
+  #echo \"Run celery dev using the following command:\"
 
-  echo \"Run celery dev using the following command:\"
   make dev-env && celery --no-color --app=rhodecode.lib.celerylib.loader worker --autoscale=4,2 --max-tasks-per-child=100 --task-events --loglevel=DEBUG --ini=.dev/dev.ini
   " > $exec_script
     chmod +x $exec_script
@@ -1380,10 +1397,13 b' dev_tools_celeryd_command() {'
     echo $container_name not found
   fi
 
+  # HELPER
+  # docker logs -f $(docker ps -q --filter "name=celeryd")
+
   eval "
   WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME RC_DEV_CMD_HELP=\"$RC_DEV_CMD_HELP\" \
   ./rcstack stack --env-file-path $env_file rhodecode -f docker-compose-apps.dev.yaml \
-  run -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
+  run -e RC_APP_PROC=1 -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
   --workdir=\"$code_workdir\" \
   --name=\"$container_name\" \
   --detach \
@@ -1472,6 +1492,7 b' dev_tools_sshd_command() {'
 
   code_workdir=${args[--workdir]}
   cmd_script=${args[--cmd]}
+  force_cmd=${args[--force-cmd]}
 
   exec_script=$WORKSPACE_HOME/$cmd_script
   container_name=dev-sshd
@@ -1481,14 +1502,15 b' dev_tools_sshd_command() {'
 
   RC_DEV_CMD_HELP=""
 
-  if [[ ! -f $exec_script ]]; then
+  if [[ ! -f $exec_script || $force_cmd ]]; then
     echo "Generating new $exec_script file..."
     mkdir -p $(dirname $exec_script)
 
     cat <<< "
+  #!/bin/bash
   # Generated dev-env script for ssh
+  #echo \"Run ssh dev using the following command:\"
 
-  echo \"Run ssh dev using the following command:\"
   make dev-env && mkdir -p /run/sshd && /usr/sbin/sshd -f /etc/rhodecode/sshd_config -D -e
   " > $exec_script
     chmod +x $exec_script
@@ -1508,12 +1530,15 b' dev_tools_sshd_command() {'
     echo $container_name not found
   fi
 
+  # HELPER
+  # docker logs -f $(docker ps -q --filter "name=sshd")
+
   RC_SSH_PORT=9022
 
   eval "
   WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME RC_DEV_CMD_HELP=\"$RC_DEV_CMD_HELP\" \
   ./rcstack stack --env-file-path $env_file rhodecode -f docker-compose-apps.dev.yaml \
-  run -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
+  run -e RC_APP_PROC=1 -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
   --workdir=\"$code_workdir\" \
   --name=\"$container_name\" \
   --detach \
@@ -1600,6 +1625,7 b' dev_tools_svnd_command() {'
 
   code_workdir=${args[--workdir]}
   cmd_script=${args[--cmd]}
+  force_cmd=${args[--force-cmd]}
 
   exec_script=$WORKSPACE_HOME/$cmd_script
   container_name=dev-svnd
@@ -1609,14 +1635,15 b' dev_tools_svnd_command() {'
 
   RC_DEV_CMD_HELP=""
 
-  if [[ ! -f $exec_script ]]; then
+  if [[ ! -f $exec_script || $force_cmd ]]; then
     echo "Generating new $exec_script file..."
     mkdir -p $(dirname $exec_script)
 
     cat <<< "
+  #!/bin/bash
   # Generated dev-env script for svn
+  #echo \"Run svn dev using the following command:\"
 
-  echo \"Run svn dev using the following command:\"
   make dev-env && apachectl -D FOREGROUND
   " > $exec_script
     chmod +x $exec_script
@@ -1636,10 +1663,13 b' dev_tools_svnd_command() {'
     echo $container_name not found
   fi
 
+  # HELPER
+  # docker logs -f $(docker ps -q --filter "name=svnd")
+
   eval "
   WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME RC_DEV_CMD_HELP=\"$RC_DEV_CMD_HELP\" \
   ./rcstack stack --env-file-path $env_file rhodecode -f docker-compose-apps.dev.yaml \
-  run -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
+  run -e RC_APP_PROC=1 -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
   --workdir=\"$code_workdir\" \
   --name=\"$container_name\" \
   --detach \
@@ -2645,6 +2675,14 b' dev_tools_celeryd_parse_requirements() {'
         fi
         ;;
 
+      # :flag.case
+      --force-cmd)
+
+        # :flag.case_no_arg
+        args['--force-cmd']=1
+        shift
+        ;;
+
       -?*)
         printf "invalid option: %s\n" "$key" >&2
         exit 1
@@ -2799,6 +2837,14 b' dev_tools_sshd_parse_requirements() {'
         fi
         ;;
 
+      # :flag.case
+      --force-cmd)
+
+        # :flag.case_no_arg
+        args['--force-cmd']=1
+        shift
+        ;;
+
       -?*)
         printf "invalid option: %s\n" "$key" >&2
         exit 1
@@ -2953,6 +2999,14 b' dev_tools_svnd_parse_requirements() {'
         fi
         ;;
 
+      # :flag.case
+      --force-cmd)
+
+        # :flag.case_no_arg
+        args['--force-cmd']=1
+        shift
+        ;;
+
       -?*)
         printf "invalid option: %s\n" "$key" >&2
         exit 1