Enable wait mode.

[utils.git] / autodlctl

diff --git a/autodlctl b/autodlctl
index 1d0cdc1..6bac751 100755 (executable)
--- a/autodlctl
+++ b/autodlctl
@@ -38,6 +38,9 @@ function getnext
     fi
     infofile="$d/.autodl/rtinfo"
     args=(-e "$fsexpr" -t "$tag $curep" -I "$infofile")
+    if [ -e "$d/.autodl/wait" ]; then
+       args=("${args[@]}" -w)
+    fi
     if [ -r "$d/.autodl/uarg" ]; then
        uarg="`cat "$d/.autodl/uarg"`"
     elif [ -e "$d/.autodl/autouarg" ]; then
@@ -68,6 +71,7 @@ function getnext
                echo "Configuration error, disabling $tag"
                cp "$outfile" "$d/.autodl/conferr"
                touch "$d/.autodl/disabled"
+               echo "$tag" >>"$HOME/dc/autodl/faulty"
            fi
        else
            echo "episode $curep of $tag done"
@@ -160,8 +164,10 @@ while [ "$done" != y ]; do
                else
                    tag="`basename "$d"`"
                fi
+               start=y
                if [ -e "$d/.autodl/disable" ]; then
                    echo "disabling $tag per user request"
+                   start=n
                    touch "$d/.autodl/disabled"
                    rm -f "$d/.autodl/disable"
                    if [ -r "$HOME/dc/autodl/run/$tag" ]; then
@@ -171,17 +177,35 @@ while [ "$done" != y ]; do
                    else
                        echo "could not find pid for $tag"
                    fi
-               elif [ ! -r "$d/.autodl/sexpr" ]; then
-                   touch "$d/.autodl/disabled"
-                   echo "$tag lacks sexpr" >&2
-                   echo "$tag" >>"$HOME/dc/autodl/faulty"
-               else
-                   if [ ! -e "$HOME/dc/autodl/run/$tag" ]; then
-                       if [ $((`date +%s` - $lastget)) -gt 20 ]; then
-                           getnext "$d" "$tag" &
-                           lastget=`date +%s`
-                           pid=$!
-                           echo "$pid" >"$HOME/dc/autodl/run/$tag"
+               fi
+               if [ -e "$d/.autodl/restart" ]; then
+                   echo "restarting $tag per user request"
+                   rm -f "$d/.autodl/restart"
+                   if [ -r "$HOME/dc/autodl/run/$tag" ]; then
+                       pid="`cat "$HOME/dc/autodl/run/$tag"`"
+                       echo "sending SIGUSR1 to $pid"
+                       kill -USR1 "$pid"
+                       while [ -e "$HOME/dc/autodl/run/$tag" ]; do
+                           echo "waiting for it to exit"
+                           sleep 1
+                       done
+                   else
+                       echo "could not find pid for $tag"
+                   fi
+               fi
+               if [ $start = y ]; then
+                   if [ ! -r "$d/.autodl/sexpr" ]; then
+                       touch "$d/.autodl/disabled"
+                       echo "$tag lacks sexpr" >&2
+                       echo "$tag" >>"$HOME/dc/autodl/faulty"
+                   else
+                       if [ ! -e "$HOME/dc/autodl/run/$tag" ]; then
+                           if [ $((`date +%s` - $lastget)) -gt 20 ]; then
+                               getnext "$d" "$tag" &
+                               lastget=`date +%s`
+                               pid=$!
+                               echo "$pid" >"$HOME/dc/autodl/run/$tag"
+                           fi
                        fi
                    fi
                fi