Merge branch 'feature/KASM-2393-disable-verbose-logging-of-process-watchers-in-custom-startup' into 'develop'

KASM-2393 Added logic to turn off -x before watcher loops

Closes KASM-2393

See merge request kasm-technologies/internal/workspaces-images!43
This commit is contained in:
Justin Travis 2022-05-04 06:39:02 +00:00
commit da991731c2
32 changed files with 104 additions and 6 deletions

View File

@ -57,6 +57,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -57,6 +57,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -57,6 +57,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -68,6 +70,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -68,6 +70,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -59,6 +59,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -51,6 +51,9 @@ kasm_startup() {
fi fi
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -63,6 +66,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -58,6 +58,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -72,6 +74,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -68,6 +70,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -68,6 +70,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -68,6 +68,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -82,6 +84,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ]; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ]; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -60,6 +60,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -73,6 +75,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -70,6 +72,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -57,6 +57,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -70,6 +72,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -56,6 +56,8 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -69,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi

View File

@ -55,6 +55,9 @@ kasm_startup() {
fi fi
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
echo "Entering process startup loop"
set +x
while true while true
do do
if ! pgrep -x $PGREP > /dev/null if ! pgrep -x $PGREP > /dev/null
@ -68,6 +71,7 @@ kasm_startup() {
fi fi
sleep 1 sleep 1
done done
set -x
fi fi