svc

чување a36f45b144b3feff68ec99c713c9b25d0f55684b
родитељ 733a03b0e8ebf00274b9d2142b4aab03420225e4
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Fri, 22 Jul 2022 22:08:20 +0200

Fix metalog

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
svc.d/avail/metalog
 | 
101
++++++++++++++++++++++++++++---------------------------------------------------

измењених датотека: 1, додавања: 36(+), брисања: 65(-)
diff --git a/svc.d/avail/metalog b/svc.d/avail/metalog
@@ -16,71 +16,42 @@ case $1 in
 			grep $(<"${PIDFILE}"))" ]; then
 			exit 2
 		fi;;
-	-s)	${svcbin} ${PARAMS} >/dev/null 2>&1 &
-		tries=4
-		childpid=$(ps -ef | \
-			awk '{if ($3 = "1" && match($8, "'\
-${svcbin//\//\\\/}'")) print $2}')
-		while [ -z "${childpid}" ]
-		do
-			/bin/usleep 100000
-			tries=$((tries-1))
-			if [ "${tries}" -eq 0 ]; then
-				exit 2
-			fi
-			childpid=$(ps -ef | \
-				awk '{if ($3 = "1" && match($8, "'\
-${svcbin//\//\\\/}'")) print $2}')
-		done
-		echo "${childpid}" > "${PIDFILE}";;
-	-k)	if [ ! -e "${PIDFILE}" ]; then
-			exit 1
-		elif [ -z "$(ps -ef | awk '{print $2}' | \
-			grep $(<"${PIDFILE}"))" ]
-		then
-			rm "${PIDFILE}"
-			exit 1
-		else
-			kill $(<"${PIDFILE}") >/dev/null 2>&1
-			if [ -n "$(ps -ef | awk '{print $2}' | \
-				grep $(<"${PIDFILE}"))" ]
-			then
-				pkill -9 $(<"${PIDFILE}") >/dev/null 2>&1 \
-					|| exit 2
-			fi
-			rm "${PIDFILE}"
-		fi;;
-	-r)	if [ -e "${PIDFILE}" ]; then
-			if [ -z "$(ps -ef | awk '{print $2}' | \
-				grep $(<"${PIDFILE}"))" ]
-			then
-				rm "${PIDFILE}"
-			else
-				kill $(<"${PIDFILE}") >/dev/null 2>&1
-				if [ -n "$(ps -ef | awk '{print $2}' | \
-					grep $(<"${PIDFILE}"))" ]
+	-s)	$0 -e
+		case $? in
+			2)	${svcbin} ${PARAMS} >/dev/null 2>&1 &
+				tries=4
+				childpid=$(ps -ef | \
+					awk '{if ($3 == "1" && match($8, "'\
+${svc}'")) print $2}')
+				while [ -z "${childpid}" ]
+				do
+					/bin/usleep 100000
+					tries=$((tries-1))
+					if [ "${tries}" -eq 0 ]; then
+						exit 2
+					fi
+					childpid=$(ps -ef | \
+						awk '{if ($3 == "1" && match($8, "'\
+${svc}'")) print $2}')
+				done
+				echo "${childpid}" > "${PIDFILE}";;
+			*)	exit 1;;
+		esac;;
+	-k)	$0 -e
+		case $? in
+			0)	kill $(<"${PIDFILE}") >/dev/null 2>&1
+				if [ -e "${PIDFILE}" ] && \
+					[ -n "$(ps -ef | awk '{print $2}' | \
+						grep $(<"${PIDFILE}"))" ]
 				then
-					kill -9 $(<"${PIDFILE}") \
-						>/dev/null 2>&1 || exit 2
+					kill -9 $(<"${PIDFILE}") >/dev/null 2>&1 \
+						|| exit 2
 				fi
-				rm "${PIDFILE}"
-			fi
-		fi
-		${svcbin} ${PARAMS} >/dev/null 2>&1 &
-		tries=4
-		childpid=$(ps -ef | \
-			awk '{if ($3 = "1" && match($8, "'\
-${svcbin//\//\\\/}'")) print $2}')
-		while [ -z "${childpid}" ]
-		do
-			/bin/usleep 100000
-			tries=$((tries-1))
-			if [ "${tries}" -eq 0 ]; then
-				exit 2
-			fi
-			childpid=$(ps -ef | \
-				awk '{if ($3 = "1" && match($8, "'\
-${svcbin//\//\\\/}'")) print $2}')
-		done
-		echo "${childpid}" > "${PIDFILE}";;
+				if [ -e "${PIDFILE}" ]; then
+					rm "${PIDFILE}"
+				fi;;
+			*)	exit 1;;
+		esac;;
+	-r)	$0 -k
+		$0 -s;;
 esac