Merge pull request #12 from devilbox/release-1.0.3

Ensure errors are always shown, regardless of log level

Author: cytopia

test/01.sh

@@ -15,6 +15,7 @@ cleanup() {
 	rm -rf "${DIR_PATH}" || true
 	rm -rf "${SCRIPT_PATH}/01.actual" || true
 	rm -rf "${SCRIPT_PATH}/01.expected" || true
+	rm -rf "${SCRIPT_PATH}/01.tmp" || true
 }
 
 
@@ -35,24 +36,24 @@ touch    "${DIR_PATH}/file 2"
 ### 02. Setup expected
 ###
 {
-	echo "add: ./dir 1";
-	echo "add: ./dir 2";
-	echo "add: ./dir 3";
-	echo "add: ./dir 4";
+	echo "[OK]  ADD: succeeded: ./dir 1"
+	echo "[OK]  ADD: succeeded: ./dir 2"
+	echo "[OK]  ADD: succeeded: ./dir 3"
+	echo "[OK]  ADD: succeeded: ./dir 4"
 } > "${SCRIPT_PATH}/01.expected"
 
 
 ###
 ### 03. Run watcherd
 ###
 cd "${DIR_PATH}"
-"${BIN_PATH}/watcherd" -p "." -a "echo 'add: %p'" -d "echo 'del: %p'" > "${SCRIPT_PATH}/01.actual" &
+"${BIN_PATH}/watcherd" -v -p "." -a "echo 'add: %p'" -d "echo 'del: %p'" > "${SCRIPT_PATH}/01.tmp" &
 watch_pid="${!}"
 echo "Started watcherd with pid: ${watch_pid}"
 echo "Waiting 5 sec."
 sleep 5
 
-
+cat "${SCRIPT_PATH}/01.tmp" | grep -Eo '\[OK.*' > "${SCRIPT_PATH}/01.actual"
 
 ###
 ### 04 .Compare results and shutdown

watcherd

@@ -25,11 +25,11 @@ IFS=$'\n'
 
 # Versioning
 MY_NAME="watcherd"
-MY_DATE="2020-12-11"
+MY_DATE="2022-12-17"
 MY_URL="https://github.com/devilbox/watcherd"
 MY_AUTHOR="cytopia <[email protected]>"
 MY_GPGKEY="0xA02C56F0"
-MY_VERSION="1.0.2"
+MY_VERSION="1.0.3"
 MY_LICENSE="MIT"
 
 # Default settings
@@ -130,14 +130,16 @@ function action() {
 	action="${action//%p/${directory}}"
 	action="${action//%n/${name}}"
 
-	if eval "${action}"; then
+	if OUTPUT="$( eval "${action}" 2>&1 )"; then
 		if [ "${verbose}" -gt "0" ]; then
 			printf "%s: [%s] [OK]  %s succeeded: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
 		fi
 		return 0
 	else
-		if [ "${verbose}" -gt "0" ]; then
-			printf "%s: [%s] [ERR] %s failed:    %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
+		printf "%s: [%s] [ERR] %s failed:    %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}" >&2
+		printf "%s: [%s] [ERR] %s failed:    %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${action}" >&2
+		if [ -n "${OUTPUT}" ]; then
+			printf "%s: [%s] [ERR] %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${OUTPUT}" >&2
 		fi
 		return 1
 	fi
@@ -151,14 +153,15 @@ function trigger() {
 	# Only run trigger when command has been specified (not empty)
 	if [ -n "${action}" ]; then
 		if [ "${changes}" -eq "1" ]; then
-			if  eval "${action}"; then
+			if OUTPUT="$( eval "${action}" 2>&1 )"; then
 				if [ "${verbose}" -gt "0" ]; then
 					printf "%s: [%s] [OK]  %s succeeded: %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
 				fi
 				return 0
 			else
-				if [ "${verbose}" -gt "0" ]; then
-					printf "%s: [%s] [ERR] %s failed:    %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
+				printf "%s: [%s] [ERR] %s failed:    %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}" >&2
+				if [ -n "${OUTPUT}" ]; then
+					printf "%s: [%s] [ERR] %s\\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${OUTPUT}" >&2
 				fi
 				# Also return 0 here in order to not abort the loop
 				return 0