From 3faf8ab71d24dd2a272b9fe2a1e5c519606e9223 Mon Sep 17 00:00:00 2001 From: Matteo Date: Tue, 17 Mar 2026 16:19:20 +0100 Subject: [PATCH] feat : debbug more easy --- RebuildBdd/run-rebuild-bdd.sh | 54 +++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/RebuildBdd/run-rebuild-bdd.sh b/RebuildBdd/run-rebuild-bdd.sh index e8a11c8..b22687b 100755 --- a/RebuildBdd/run-rebuild-bdd.sh +++ b/RebuildBdd/run-rebuild-bdd.sh @@ -309,12 +309,20 @@ chmod 700 \"\$CORE_SCRIPT\" chmod 700 \"\$PRECHECK_SCRIPT\" PRECHECK_JSON=\"/tmp/check_target_\${REQUEST_ID}.json\" +PRECHECK_STDERR=\"/tmp/check_target_\${REQUEST_ID}.stderr\" +CORE_JSON=\"/tmp/rebuild_target_\${REQUEST_ID}.json\" +CORE_STDERR=\"/tmp/rebuild_target_\${REQUEST_ID}.stderr\" \"\$PRECHECK_SCRIPT\" \ --env-file \"\$TARGET_ENV_FILE\" \ --request-id \"\$REQUEST_ID\" \ --non-interactive \ - --json-only >\"\$PRECHECK_JSON\" + --json-only >\"\$PRECHECK_JSON\" 2>\"\$PRECHECK_STDERR\" || { + cat \"\$PRECHECK_STDERR\" >&2 2>/dev/null || true + cat \"\$PRECHECK_JSON\" 2>/dev/null || true + rm -f \"\$PRECHECK_JSON\" \"\$PRECHECK_STDERR\" \"\$CORE_JSON\" \"\$CORE_STDERR\" + exit 1 + } PRECHECK_STATUS=\"\$(python3 - <<'PY' \"\$PRECHECK_JSON\" import json, sys @@ -322,24 +330,58 @@ with open(sys.argv[1], 'r', encoding='utf-8') as f: data = json.load(f) print(data.get('status', 'error')) PY -)\" +)\" || { + cat \"\$PRECHECK_STDERR\" >&2 2>/dev/null || true + cat \"\$PRECHECK_JSON\" 2>/dev/null || true + rm -f \"\$PRECHECK_JSON\" \"\$PRECHECK_STDERR\" \"\$CORE_JSON\" \"\$CORE_STDERR\" + exit 1 +} if [[ \"\$PRECHECK_STATUS\" != \"success\" ]]; then + cat \"\$PRECHECK_STDERR\" >&2 2>/dev/null || true cat \"\$PRECHECK_JSON\" - rm -f \"\$PRECHECK_JSON\" + rm -f \"\$PRECHECK_JSON\" \"\$PRECHECK_STDERR\" \"\$CORE_JSON\" \"\$CORE_STDERR\" exit 1 fi -rm -f \"\$PRECHECK_JSON\" +rm -f \"\$PRECHECK_JSON\" \"\$PRECHECK_STDERR\" -exec \"\$CORE_SCRIPT\" \ +\"\$CORE_SCRIPT\" \ --env-file \"\$TARGET_ENV_FILE\" \ --db \"\$REQUESTED_DB\" \ --overwrite \"\$ALLOW_OVERWRITE\" \ --restore-roles \"\$RESTORE_ROLES\" \ --request-id \"\$REQUEST_ID\" \ --non-interactive \ - --json-only + --json-only >\"\$CORE_JSON\" 2>\"\$CORE_STDERR\" || { + cat \"\$CORE_STDERR\" >&2 2>/dev/null || true + cat \"\$CORE_JSON\" 2>/dev/null || true + rm -f \"\$CORE_JSON\" \"\$CORE_STDERR\" + exit 1 + } + +CORE_STATUS=\"\$(python3 - <<'PY' \"\$CORE_JSON\" +import json, sys +with open(sys.argv[1], 'r', encoding='utf-8') as f: + data = json.load(f) +print(data.get('status', 'error')) +PY +)\" || { + cat \"\$CORE_STDERR\" >&2 2>/dev/null || true + cat \"\$CORE_JSON\" 2>/dev/null || true + rm -f \"\$CORE_JSON\" \"\$CORE_STDERR\" + exit 1 +} + +if [[ \"\$CORE_STATUS\" != \"success\" ]]; then + cat \"\$CORE_STDERR\" >&2 2>/dev/null || true + cat \"\$CORE_JSON\" + rm -f \"\$CORE_JSON\" \"\$CORE_STDERR\" + exit 1 +fi + +cat \"\$CORE_JSON\" +rm -f \"\$CORE_JSON\" \"\$CORE_STDERR\" " ssh "${SSH_OPTS[@]}" "${TARGET_USER}@${TARGET_HOST}" "$REMOTE_BOOTSTRAP_CMD" >"$REMOTE_RESULT_JSON" 2>&1 \