Changeset 555

Timestamp:

Sep 6, 2007 2:01:37 PM (6 years ago)

Author:

jrollins

Message:

cereal: small update to is_running function to provide better return codes with
more information about running state.

Location:

trunk/cereal

Files:

• debian/changelog (modified) (1 diff)
• fs/usr/bin/cereal (modified) (1 diff)
• fs/usr/sbin/cereal-admin (modified) (2 diffs)
• fs/usr/share/cereal/common (modified) (2 diffs)

trunk/cereal/debian/changelog

@@ +1 @@
+cereal (0.13-1) unstable; urgency=low
+
+  * update of is_running function with better tests/return
+
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Thu, 06 Sep 2007 14:00:12 -0400
+
 cereal (0.12-1) unstable; urgency=high
 

trunk/cereal/fs/usr/bin/cereal

@@ -43 +43 @@
         failure "Session '$SESSION' not found.
 Type 'cereal list' to list sessions."
-    elif ! is_linked "$SESSION" ; then
-        failure "Session '$SESSION' does not appear to be running."
+    elif ! is_running "$SESSION" ; then
+        failure "Session '$SESSION' not running."
     elif ! can_attach "$SESSION" "$USER" ; then
         failure "You are not allowed to attach to session '$SESSION'."

trunk/cereal/fs/usr/sbin/cereal-admin

@@ -140 +140 @@
             continue
         elif ! chpst -e "$SESSIONDIR/$SESSION/env/" sh -c start_check ; then
-            echo "Session '$SESSION' no properly configured."
+            echo "Session '$SESSION' not properly configured."
             ((ERR++))
             continue
@@ -179 +179 @@
             continue
         elif ! is_linked "$SESSION" ; then
-            echo "Session '$SESSION' not running."
+            echo "Session '$SESSION' not linked."
             ((ERR++))
             continue

trunk/cereal/fs/usr/share/cereal/common

@@ -79 +79 @@
 # is_running SESSION
 is_running() {
-    grep -q run "$SERVICE.$1/supervise/stat"
+    local SD="$SERVICE.$1"
+    # if session is linked in service dir...
+    if [ -L "$SD" ] ; then
+        # return 2 if supervise/stat says that the service is *not* running
+        if [ -r "$SD/supervise/stat" ] && ! grep -q run "$SD/supervise/stat" ; then
+            return 2
+        fi
+        # otherwise return 0 since either it is running, or we can't tell
+        # whether the service is actually running or not, so assume that it is
+        # if it's linked.
+        return 0
+    else
+        # return 1 if it's not linked
+        return 1
+    fi
 }
 export -f is_running
@@ -119 +133 @@
     is_session "$SESSION" || failure "Session '$SESSION' not found."
 
-    # set state flag ('+' linked, '-' stopped, '!' linked but stopped)
-    # (last flag works only for users that can read supervise/stat)
+    # set state flag ('+' linked (0), '-' stopped (1), '!' linked but stopped(2))
+    # last flag works only for users that can read supervise/stat
     SFLAG='-'
-    if is_linked "$SESSION" ; then
-        SFLAG='+'
-        if [ -r "$SERVICE.$SESSION/supervise/stat" ] && ! is_running "$SESSION" ; then
+    is_running "$SESSION"
+    case $? in
+        0)
+            SFLAG='+'
+            ;;
+        1)
+            SFLAG='-'
+            ;;
+        2)
             SFLAG='!'
-        fi
-    fi
+            ;;
+    esac
     # set attach flag
     AFLAG='-'