Handle empty log directory correctly in 'log' command.

perfsonar · Jun 24, 2024 · b95b7b7 · b95b7b7
1 parent ce3d6e1
commit b95b7b7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/pscheduler-server/pscheduler-server/utilities/log.raw b/pscheduler-server/pscheduler-server/utilities/log.raw
@@ -13,13 +13,18 @@ LOGBASE="__LOGFILE__"
 
 if [ $# -eq 0 ]
 then
-    exec cat "${LOGDIR}/${LOGBASE}"
+    LATEST_LOG="${LOGDIR}/${LOGBASE}"
+    if [ -s "${LATEST_LOG}" ]
+    then
+        exec cat "${LATEST_LOG}"
+    fi
 elif [ "$1" = "--all" ]
 then
+    # PORT: xargs -r is non-POSIX
     find "${LOGDIR}" -type f -name "${LOGBASE}*" -print0 \
-	| xargs -0 ls -htr \
+	| xargs -r -0 ls -htr \
 	| tr "\n" "\0" \
-	| xargs -0 cat
+	| xargs -r -0 cat
 else
     echo "Usage: $(basename "$0") [ --all ]"
     exit 1