diff options
| -rwxr-xr-x | acid/acid | 49 |
1 files changed, 43 insertions, 6 deletions
@@ -16,20 +16,51 @@ should_restart() { [ $runtime -gt $CYCHE_MAINT_TIME ] } +log_filename() { + latest=$(find /logs -type f | sort -rn | sed 's/^\/logs\/0*//;s/_.*$//;1q') + [ -z "$latest" ] && number="1" || number=$((latest+1)) + printf '/logs/%010i_%s_%s.log\n' "$number" "$(now)" "$1" +} + +do_job() { + hash=$(acid-source "$1" "$2" "$3") + res=$? + + if [ $res -eq 2 ]; then + echo -e "\n\nJOB FAILED" + return 1 + fi + + if [ $res -eq 1 ] || [ "$5" == "--force" ]; then + if ! acid-build "$1" "$4" "$hash" "$6"; then + echo -e "\n\nJOB FAILED" + fi + return 1 + fi + + return 0 +} + update() { forceopt="--force-self" selfopt="--self" for line in "${CYCHE_SERVICES[@]}"; do read -r -a arr <<< "$line" - hash=$(acid-source ${arr[@]:0:3}) + + log=$(log_filename "${arr[0]}") + [ "$1" == "$forceopt" ] && f="--force" || f="" + + touch /logs/active + do_job $line "$f" "$selfopt" >"$log" 2>&1 res=$? + rm -f /logs/active - if [ $res -ne 2 ]; then - if [ $res -eq 1 ] || [ "$1" == "$forceopt" ]; then - acid-build "${arr[0]}" "${arr[3]}" "$hash" $selfopt - sleep "$CYCHE_JOB_TIME" - fi + if [ $res -ne 0 ]; then + echo "Updated ${arr[0]}" + sleep "$CYCHE_JOB_TIME" + else + rm -f "$log" fi forceopt="--force" @@ -44,6 +75,7 @@ remove() { for name in $removed; do acid-remove "$name" + echo "Removed $name" sleep "$CYCHE_JOB_TIME" done } @@ -52,7 +84,11 @@ remove() { # $CYCHE_MAINT_TIME period, so rebuild services and perform cleanup now. We # sleep briefly at the beginning to allow the previous cychedelic instance time # to die. +echo "cychedelic ACID kicking in ..." +rm -f /logs/active + sleep "$CYCHE_STARTUP_TIME" + remove update --force docker system prune --force --all @@ -65,4 +101,5 @@ while ! should_restart; do done # force self-upgrade to trigger maintenance activities +echo "Forcing daemon restart" update --force-self |