Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 21:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

NC-Connector echte Runtime-Fehlerausgabe erhalten

Browse Source
This commit is contained in:
Terranom674
2026-08-18 16:49:54 +02:00
parent c28a8c6f80
commit e0cd91a0b7
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
runtime/sync.sh
View File

@@ -113,10 +113,11 @@ run_stage() {
ERROR_STAGE="$stage" ERROR_STAGE="$stage"
ERROR_MESSAGE="$message" ERROR_MESSAGE="$message"
set +e if output="$("$@" 2>&1)"; then
output="$("$@" 2>&1)" exit_code=0
exit_code=$? else
set -e exit_code=$?
fi
if [[ -n "$output" ]]; then if [[ -n "$output" ]]; then
printf '%s\n' "$output" printf '%s\n' "$output"
fi fi
@@ -169,14 +170,15 @@ if [[ "$NEEDS_LOCAL_REPAIR" == "1" ]]; then
else else
ERROR_STAGE="Nextcloud-Aktivität prüfen" ERROR_STAGE="Nextcloud-Aktivität prüfen"
ERROR_MESSAGE="Nextcloud-Aktivität konnte nicht geprüft werden" ERROR_MESSAGE="Nextcloud-Aktivität konnte nicht geprüft werden"
set +e if GATE_OUTPUT="$(python3 "$SCRIPT_DIR/lib/activity_gate.py" check \
GATE_OUTPUT="$(python3 "$SCRIPT_DIR/lib/activity_gate.py" check \
--state "$ACTIVITY_STATE" --host "$NC_DB_HOST" --port "$NC_DB_PORT" \ --state "$ACTIVITY_STATE" --host "$NC_DB_HOST" --port "$NC_DB_PORT" \
--database "$NC_DB_NAME" --user "$NC_DB_USER" --password-file "$NC_DB_PASSWORD_FILE" \ --database "$NC_DB_NAME" --user "$NC_DB_USER" --password-file "$NC_DB_PASSWORD_FILE" \
--view "$NC_ACTIVITY_VIEW" --source-view "$NC_DB_VIEW" \ --view "$NC_ACTIVITY_VIEW" --source-view "$NC_DB_VIEW" \
--quiet "$QUIET_SECONDS" --max-wait "$MAX_WAIT_SECONDS" --full-after "$FULL_SYNC_SECONDS" 2>&1)" --quiet "$QUIET_SECONDS" --max-wait "$MAX_WAIT_SECONDS" --full-after "$FULL_SYNC_SECONDS" 2>&1)"; then
GATE_RESULT=$? GATE_RESULT=0
set -e else
GATE_RESULT=$?
fi
if [[ -n "$GATE_OUTPUT" ]]; then if [[ -n "$GATE_OUTPUT" ]]; then
printf '%s\n' "$GATE_OUTPUT" printf '%s\n' "$GATE_OUTPUT"
fi fi
@@ -214,13 +216,14 @@ run_stage \
if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
ERROR_STAGE="Piwigo synchronisieren" ERROR_STAGE="Piwigo synchronisieren"
ERROR_MESSAGE="Piwigo-Synchronisierung fehlgeschlagen" ERROR_MESSAGE="Piwigo-Synchronisierung fehlgeschlagen"
set +e if PIWIGO_OUTPUT="$(php "$SCRIPT_DIR/lib/piwigo-sync.php" \
PIWIGO_OUTPUT="$(php "$SCRIPT_DIR/lib/piwigo-sync.php" \
--piwigo-root="$PIWIGO_ROOT" \ --piwigo-root="$PIWIGO_ROOT" \
--connection-id="$CONNECTION_ID" \ --connection-id="$CONNECTION_ID" \
--base-url="http://127.0.0.1" 2>&1)" --base-url="http://127.0.0.1" 2>&1)"; then
PIWIGO_EXIT=$? PIWIGO_EXIT=0
set -e else
PIWIGO_EXIT=$?
fi
printf '%s\n' "$PIWIGO_OUTPUT" printf '%s\n' "$PIWIGO_OUTPUT"
if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then if grep -q 'Piwigo-Synchronisierung per API erfolgreich' <<<"$PIWIGO_OUTPUT"; then
@@ -260,13 +263,14 @@ fi
ERROR_STAGE="Aktivitätsstand speichern" ERROR_STAGE="Aktivitätsstand speichern"
ERROR_MESSAGE="Aktivitätsstand konnte nicht gespeichert werden" ERROR_MESSAGE="Aktivitätsstand konnte nicht gespeichert werden"
set +e if COMMIT_OUTPUT="$(python3 "$SCRIPT_DIR/lib/activity_gate.py" commit \
COMMIT_OUTPUT="$(python3 "$SCRIPT_DIR/lib/activity_gate.py" commit \
--state "$ACTIVITY_STATE" --host "$NC_DB_HOST" --port "$NC_DB_PORT" \ --state "$ACTIVITY_STATE" --host "$NC_DB_HOST" --port "$NC_DB_PORT" \
--database "$NC_DB_NAME" --user "$NC_DB_USER" --password-file "$NC_DB_PASSWORD_FILE" \ --database "$NC_DB_NAME" --user "$NC_DB_USER" --password-file "$NC_DB_PASSWORD_FILE" \
--view "$NC_ACTIVITY_VIEW" --source-view "$NC_DB_VIEW" 2>&1)" --view "$NC_ACTIVITY_VIEW" --source-view "$NC_DB_VIEW" 2>&1)"; then
COMMIT_EXIT=$? COMMIT_EXIT=0
set -e else
COMMIT_EXIT=$?
fi
if [[ -n "$COMMIT_OUTPUT" ]]; then if [[ -n "$COMMIT_OUTPUT" ]]; then
printf '%s\n' "$COMMIT_OUTPUT" printf '%s\n' "$COMMIT_OUTPUT"
fi fi