mirror of
https://github.com/Terranom674/Piwigo_Bratonien_Tools.git
synced 2026-09-20 12:13:16 +00:00
Preserve warmup worker exit codes in guard
This commit is contained in:
@@ -20,14 +20,10 @@ flock -s 9
|
|||||||
|
|
||||||
COMMAND=("$@")
|
COMMAND=("$@")
|
||||||
|
|
||||||
run_command() {
|
set +e
|
||||||
"${COMMAND[@]}"
|
"${COMMAND[@]}"
|
||||||
}
|
result=$?
|
||||||
|
set -e
|
||||||
result=0
|
|
||||||
if ! run_command; then
|
|
||||||
result=$?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ein Connector-Sync kann während eines bereits laufenden Warmups neue Alben
|
# Ein Connector-Sync kann während eines bereits laufenden Warmups neue Alben
|
||||||
# melden. Der Dispatcher legt dafür nur eine Prioritätsmarke an; er startet
|
# melden. Der Dispatcher legt dafür nur eine Prioritätsmarke an; er startet
|
||||||
@@ -50,8 +46,12 @@ if [[ -f "$PRIORITY_FILE" ]]; then
|
|||||||
SYNC_COMMAND+=("--mode=sync")
|
SYNC_COMMAND+=("--mode=sync")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! "${SYNC_COMMAND[@]}"; then
|
set +e
|
||||||
result=$?
|
"${SYNC_COMMAND[@]}"
|
||||||
|
sync_result=$?
|
||||||
|
set -e
|
||||||
|
if [[ "$sync_result" -ne 0 ]]; then
|
||||||
|
result="$sync_result"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user