Диагностика автообновлений была добавлена

Этот коммит содержится в:
Виктор
2026-05-07 04:23:36 +09:00
родитель f0a1ad74e3
Коммит 754a552147
+49 -23
Просмотреть файл
@@ -9,6 +9,7 @@ LOG_FILE="/var/log/virtuality/update.log"
REMOTE="${VIRTUALITY_UPDATE_REMOTE:-origin}" REMOTE="${VIRTUALITY_UPDATE_REMOTE:-origin}"
BRANCH="${VIRTUALITY_UPDATE_BRANCH:-main}" BRANCH="${VIRTUALITY_UPDATE_BRANCH:-main}"
APPLY_SCRIPT="${SOURCE_DIR}/scripts/apply_github_update.sh" APPLY_SCRIPT="${SOURCE_DIR}/scripts/apply_github_update.sh"
ZIP_URL="${VIRTUALITY_UPDATE_ZIP_URL:-https://github.com/viktor138irk/virtuality/archive/refs/heads/${BRANCH}.zip}"
mkdir -p "$STATE_DIR" "$(dirname "$LOG_FILE")" mkdir -p "$STATE_DIR" "$(dirname "$LOG_FILE")"
@@ -32,6 +33,30 @@ write_state() {
JSON JSON
} }
diag_network() {
log "diagnostics: host=$(hostname 2>/dev/null || echo unknown)"
log "diagnostics: date=$(date -Is 2>/dev/null || date)"
if command -v getent >/dev/null 2>&1; then
getent hosts github.com >> "$LOG_FILE" 2>&1 || log "diagnostics: DNS github.com failed"
fi
if command -v git >/dev/null 2>&1; then
git --version >> "$LOG_FILE" 2>&1 || true
git -C "$SOURCE_DIR" remote -v >> "$LOG_FILE" 2>&1 || true
else
log "diagnostics: git not found"
fi
if command -v curl >/dev/null 2>&1; then
curl -I -L --connect-timeout 10 --max-time 25 https://github.com/ >> "$LOG_FILE" 2>&1 || log "diagnostics: curl github.com failed"
else
log "diagnostics: curl not found"
fi
if command -v unzip >/dev/null 2>&1; then
unzip -v | head -2 >> "$LOG_FILE" 2>&1 || true
else
log "diagnostics: unzip not found"
fi
}
( (
flock -n 9 || { flock -n 9 || {
log "another update check is already running, skip" log "another update check is already running, skip"
@@ -41,9 +66,9 @@ JSON
STARTED_AT="$(now)" STARTED_AT="$(now)"
log "checking updates" log "checking updates"
if [ ! -d "$SOURCE_DIR/.git" ]; then if [ ! -d "$SOURCE_DIR" ]; then
log "git repository not found: $SOURCE_DIR" log "source directory not found: $SOURCE_DIR"
write_state "error" "Автообновление: не найден git-репозиторий: $SOURCE_DIR" write_state "error" "Автообновление: не найдена директория исходников: $SOURCE_DIR"
exit 0 exit 0
fi fi
@@ -53,31 +78,33 @@ JSON
exit 0 exit 0
} }
current="unknown"
if [ -d "$SOURCE_DIR/.git" ]; then
current="$(git rev-parse HEAD 2>/dev/null || true)" current="$(git rev-parse HEAD 2>/dev/null || true)"
fi
current_version="$(cat VERSION 2>/dev/null || echo unknown)"
if [ -z "$current" ]; then if [ -z "$current" ]; then
log "cannot read current commit" current="unknown"
write_state "error" "Автообновление: не удалось прочитать текущий commit"
exit 0
fi
if ! git fetch --quiet "$REMOTE" "$BRANCH" >> "$LOG_FILE" 2>&1; then
log "git fetch failed"
write_state "error" "Автообновление: git fetch завершился ошибкой"
exit 0
fi fi
if [ -d "$SOURCE_DIR/.git" ]; then
if git fetch --quiet "$REMOTE" "$BRANCH" >> "$LOG_FILE" 2>&1; then
latest="$(git rev-parse "${REMOTE}/${BRANCH}" 2>/dev/null || true)" latest="$(git rev-parse "${REMOTE}/${BRANCH}" 2>/dev/null || true)"
if [ -z "$latest" ]; then if [ -n "$latest" ] && [ "$current" = "$latest" ]; then
log "cannot read remote commit ${REMOTE}/${BRANCH}" log "no updates: ${current:0:12} / version $current_version"
write_state "error" "Автообновление: не удалось прочитать удалённый commit ${REMOTE}/${BRANCH}"
exit 0
fi
if [ "$current" = "$latest" ]; then
log "no updates: ${current:0:12}"
write_state "idle" "Автообновление: новых обновлений нет" write_state "idle" "Автообновление: новых обновлений нет"
exit 0 exit 0
fi fi
log "update may be available or current commit unknown: ${current:0:12} -> ${latest:0:12}"
else
log "git fetch failed; diagnostics and apply ZIP fallback will be used"
diag_network
fi
else
log "git repository not found; apply ZIP fallback will be used"
diag_network
fi
if [ ! -f "$APPLY_SCRIPT" ]; then if [ ! -f "$APPLY_SCRIPT" ]; then
log "apply script not found: $APPLY_SCRIPT" log "apply script not found: $APPLY_SCRIPT"
@@ -85,7 +112,6 @@ JSON
exit 0 exit 0
fi fi
log "update found: ${current:0:12} -> ${latest:0:12}" write_state "running" "Автообновление: проверяем и устанавливаем обновление через устойчивый механизм"
write_state "running" "Автообновление: найдено обновление, запускаем установку" VIRTUALITY_SOURCE_DIR="$SOURCE_DIR" VIRTUALITY_UPDATE_REMOTE="$REMOTE" VIRTUALITY_UPDATE_BRANCH="$BRANCH" VIRTUALITY_UPDATE_ZIP_URL="$ZIP_URL" bash "$APPLY_SCRIPT"
VIRTUALITY_SOURCE_DIR="$SOURCE_DIR" VIRTUALITY_UPDATE_REMOTE="$REMOTE" VIRTUALITY_UPDATE_BRANCH="$BRANCH" bash "$APPLY_SCRIPT"
) 9>"$LOCK_FILE" ) 9>"$LOCK_FILE"