Updated salt-minion for Salt 2016.11.2

salt-minion

@@ -24,301 +24,133 @@
 #
 # processname: /usr/bin/salt-minion
 
-# Allow these to be overridden for tests
-: "${SALTMINION_BINDIR:=/usr/bin}"
-: "${SALTMINION_SYSCONFDIR:=/etc}"
 
-# Default values (can be overridden in settings file)
+DEBIAN_VERSION=/etc/debian_version
-: "${USER:=$(id -nu)}"
+SUSE_RELEASE=/etc/SuSE-release
-SALTMINION="${SALTMINION_BINDIR}/salt-minion"
+# Source function library.
-SALTCALL="${SALTMINION_BINDIR}/salt-call"
+if [ -f $DEBIAN_VERSION ]; then
-# SALTMINION_CONFIGS are newline-separated entries of: MINION_USER CONFIG_DIR
+   break
-: "${SALTMINION_CONFIGS:="
+elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
-$USER ${SALTMINION_SYSCONFDIR}/salt
+    . /etc/rc.status
-"}"
-SALTMINION_ARGS=""
-SALTMINION_TIMEOUT=30
-SALTMINION_TICK=1
-
-SERVICE="salt-minion"
-
-# Read in settings file
-if [ -f "${SALTMINION_SYSCONFDIR}/default/salt" ]; then
-    . "${SALTMINION_SYSCONFDIR}/default/salt"
-elif [ -f "${SALTMINION_SYSCONFDIR}/sysconfig/salt" ]; then
-    . "${SALTMINION_SYSCONFDIR}/sysconfig/salt"
-fi
-
-RETVAL=0
-NS_NOTRIM="--notrim"
-ERROR_TO_DEVNULL="/dev/null"
-
-
-_su_cmd() {
-    local user="$1"
-    shift
-
-    if [ "X$USER" = "X$user" ]; then
-        eval $1
 else
-        su -l -c "$1" "$user"
+    . /etc/rc.d/init.d/functions
-    fi
-}
-
-
-_get_pid() {
-    netstat $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \
-        | sed -r -e "\|\s${SOCK_DIR}/minion_event_${MINION_ID_HASH}_pub\.ipc$|"'!d; s|/.*||; s/.*\s//;' \
-        | uniq
-}
-
-
-_is_running() {
-    [ -n "$(_get_pid)" ]
-}
-
-
-_get_salt_config_value() {
-    _su_cmd \
-        "$MINION_USER" \
-        "\
-            \"$SALTCALL\" \
-            -c \"$CONFIG_DIR\" \
-            --no-color \
-            --local config.get \
-            \"$1\" \
-        " \
-        2>$ERROR_TO_DEVNULL \
-        | sed -r -e '2!d; s/^\s*//;'
-}
-
-
-_make_id_hash() {
-    # $1 - minion_id
-    local hasher=''
-
-    case "$(_get_salt_config_value hash_type)" in
-        (md5) hasher="md5sum";;
-        (sha1) hasher="sha1sum";;
-        (sha224) hasher="sha224sum";;
-        (sha256) hasher="sha256sum";;
-        (sha384) hasher="sha384sum";;
-        (sha512) hasher="sha512sum";;
-        (*) echo "ERROR: No salt hash_type specified";;
-    esac
-
-    if [ -n "$hasher" ]; then
-        printf "$1" | "$hasher" | cut -c 1-10
 fi
-}
-
 
-start() {
+# Default values (can be overridden below)
-    # $1 - config dir
+SALTMINION=/usr/bin/salt-minion
-    local retval=0
+PYTHON=/usr/bin/python
+MINION_ARGS=""
 
-    if _is_running; then
+if [ -f /etc/default/salt ]; then
-        echo "Service $SERVICE:$MINION_USER:$MINION_ID already running"
+    . /etc/default/salt
-        return 0
 fi
 
-    echo -n "Starting $SERVICE:$MINION_USER:$MINION_ID daemon: "
+SERVICE=salt-minion
-
+PROCESS=salt-minion
-    _su_cmd \
-        "$MINION_USER" \
-        "\
-            \"$SALTMINION\" \
-            -c \"$CONFIG_DIR\" \
-            -d $SALTMINION_ARGS \
-            ${SALTMINION_DEBUG:+-l debug} \
-        " \
-        2>$ERROR_TO_DEVNULL \
-        || retval=$?
 
-    if [ 0 -eq "$retval" ]; then
+RETVAL=0
-        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))
-        while ! _is_running; do
-            if [ "$endtime" -lt "$(date '+%s')" ]; then
-                echo -n "TIMEOUT "
-                retval=1
-                break
-            fi
-            sleep $SALTMINION_TICK
-        done
-    fi
 
-    if [ 0 -eq "$retval" ]; then
+start() {
+    echo -n $"Starting salt-minion daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        startproc -f -p /var/run/$SERVICE.pid $SALTMINION -d $MINION_ARGS
+        rc_status -v
+    elif [ -e $DEBIAN_VERSION ]; then
+        if [ -f $LOCKFILE ]; then
+            echo -n "already started, lock file found"
+            RETVAL=1
+        elif $PYTHON $SALTMINION -d $MINION_ARGS >& /dev/null; then
             echo -n "OK"
+            RETVAL=0
+        fi
+    else
+        if [[ ! -z "$(pidofproc -p /var/run/$SERVICE.pid $PROCESS)" ]]; then
+            RETVAL=$?
+            echo -n "already running"
         else
-        echo -n "FAIL"
+            daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
-        if [ -n "$SALTMINION_DEBUG" ]; then
+            RETVAL=$?
-            printf "\nPROCESSES:\n" >&2
+            [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
-            ps wwwaxu | grep '[s]alt-minion' >&2
+            echo
-            printf "\nSOCKETS:\n" >&2
+            return $RETVAL
-            netstat $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2            
-            printf "\nLOG_FILE:\n" >&2
-            tail -n 20 "$LOG_FILE" >&2
-            printf "\nENVIRONMENT:\n" >&2
-            env >&2
         fi
     fi
+    RETVAL=$?
     echo
-
+    return $RETVAL
-    return $retval
 }
 
-
 stop() {
-    # $1 - config dir
+    echo -n $"Stopping salt-minion daemon: "
-    local retval=0
+    if [ -f $SUSE_RELEASE ]; then
-
+        killproc -TERM $SALTMINION
-    if ! _is_running; then
+        rc_status -v
-        echo "Service $SERVICE:$MINION_USER:$MINION_ID is not running"
+        RETVAL=$?
-        return 0
+    elif [ -f $DEBIAN_VERSION ]; then
-    fi
+        # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        
+        if ps -ef | grep "$PYTHON $SALTMINION" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
-    echo -n "Stopping $SERVICE:$MINION_USER:$MINION_ID daemon: "
-    local pid="$(_get_pid)"
-
-    # pid below is intentionally not quoted in case there are *multiple*
-    # minions running with the same configuration.
-    _su_cmd "$MINION_USER" "kill -TERM $pid 2>/dev/null" || retval=$?
-    if [ 0 -eq "$retval" ]; then 
-        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))
-        while _is_running; do
-            if [ "$endtime" -lt "$(date '+%s')" ]; then
-                # Try one more time with a big hammer
-                _su_cmd "$MINION_USER" "kill -KILL $pid 2>/dev/null" || :
-                sleep $SALTMINION_TICK
-                if _is_running; then
-                    echo -n "TIMEOUT "
-                    retval=1
-                fi
-                break
-            fi
-            sleep 1
-        done
-
-    fi
-
-    if [ 0 -eq "$retval" ]; then
-        rm -f "$PID_FILE"
             echo -n "OK"
+            RETVAL=0
         else
-        echo -n "FAIL"
+            echo -n "Daemon is not started"
+            RETVAL=1
         fi
-
-    echo
-
-    return $retval
-}
-
-
-status() {
-    local retval=0
-    local pid="$(_get_pid)"
-
-    if [ -n "$pid" ]; then
-        # Unquote $pid here to display multiple PIDs in one line
-        echo "$SERVICE:$MINION_USER:$MINION_ID is running:" $pid
     else
-        retval=3
+        killproc $PROCESS
-        echo "$SERVICE:$MINION_USER:$MINION_ID is stopped."
+        RETVAL=$?
-        if [ -e "$PID_FILE" ]; then
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
-            echo "$SERVICE:$MINION_USER:$MINION_ID has orphaned pid file: $PID_FILE."
+        # tidy up any rogue processes:
-            retval=1
+        PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
+        if [ -n "$PROCS" ]; then
+            kill $PROCS &> /dev/null
+            sleep 1
+            PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
+            if [ -n "$PROCS" ]; then
+                kill -9 $PROCS &> /dev/null
+            fi
         fi
     fi
-    return $retval
+    echo
 }
 
 restart() {
-    # $1 - config dir
+   stop
-    stop "$1"
+   start
-    start "$1"
 }
 
-
+# See how we were called.
-main() {
-    if [ -n "$SALTMINION_DEBUG" ]; then
-        set -x
-        ERROR_TO_DEVNULL="&2"
-    fi
-
-    # Check to see if --notrim is a valid netstat option
-    if netstat --notrim 2>&1 >/dev/null | grep -q 'unrecognized'; then
-        NS_NOTRIM=''
-    fi
-
-    # Pre-filter for unhandled commands
 case "$1" in
-        (start|stop|status|restart|condrestart|try-restart) ;;
+    start|stop|restart)
-        (reload)
+        $1
-            echo "Can't reload $SERVICE - you must restart it"
-            exit 3
-            ;;
-        (*)
-            echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
-            exit 2
         ;;
-    esac
+    status)
-
+        if [ -f $SUSE_RELEASE ]; then
-    while read MINION_USER CONFIG_DIR; do
+            echo -n "Checking for service salt-minion "
-        if [ -z "$CONFIG_DIR" ]; then
+            checkproc $SALTMINION
-            continue
+            rc_status -v
-        fi
+        elif [ -f $DEBIAN_VERSION ]; then
-
+            if [ -f $LOCKFILE ]; then
-        if ! [ -d "$CONFIG_DIR" ]; then
+                RETVAL=0
-            echo "ERROR: non-existent $SERVICE config directory: $CONFIG_DIR"
+                echo "salt-minion is running."
-            RETVAL=1
+            else
-            continue
-        fi
-
-        SOCK_DIR="$(_get_salt_config_value sock_dir)"
-        PID_FILE="$(_get_salt_config_value pidfile)"
-        LOG_FILE="$(_get_salt_config_value log_file)"
-        MINION_ID="$(_get_salt_config_value id)"
-        MINION_ID_HASH="$(_make_id_hash "$MINION_ID")"
-        if [ \
-            -z "$SOCK_DIR" \
-            -o -z "$PID_FILE" \
-            -o -z "$LOG_FILE" \
-            -o -z "$MINION_ID" \
-            -o -z "$MINION_ID_HASH" \
-        ]; then
-            echo "ERROR: Unable to look-up config values for $CONFIG_DIR"
                 RETVAL=1
-            continue
+                echo "salt-minion is stopped."
             fi
-
-        # See how we were called.
-        case "$1" in
-            (start|stop|restart|status)
-                "$1" || RETVAL=$?
-                ;;
-            (condrestart|try-restart)
-                if ! _is_running; then
-                    RETVAL=7
         else
-                    stop
+            status $PROCESS
-                    start || RETVAL=$?
+            RETVAL=$?
         fi
         ;;
-            (*)
+    condrestart)
-                echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
+        [ -f $LOCKFILE ] && restart || :
-                RETVAL=2
+        ;;
+    reload)
+        echo "can't reload configuration, you have to restart it"
+        RETVAL=1
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        exit 1
         ;;
 esac
-    done <<EOF
-$SALTMINION_CONFIGS
-EOF
-
 exit $RETVAL
-}
-
-
-if [ "$#" = 0 ]; then
-    main
-else
-    main "$@"
-fi