Skip to content

Fix: Do not ignore errors thrown by occ talk:turn:list #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seriAlizations merged 2 commits into from
Aug 12, 2026
Merged

Fix: Do not ignore errors thrown by occ talk:turn:list #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b756cfd
Fix: Do not ignore errors thrown by occ talk:turn:list
seriAlizations Aug 12, 2026
b8b3b2a
Fix: Capture all errors, add retry_occ() with 3 retries
seriAlizations Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,21 @@ execute_occ_secret_command() {
fi
}

# Run an OCC command with up to 3 attempts on failure
# Returns: 0 on success, 1 after all attempts are exhausted
retry_occ() {
_retry_attempt=1
while [ "${_retry_attempt}" -le 3 ]; do
if _RETRY_OUTPUT=$(php occ "${@}"); then
return 0
fi
log_warning "occ ${1} failed (attempt ${_retry_attempt}/3)"
_retry_attempt=$(( _retry_attempt + 1 ))
[ "${_retry_attempt}" -le 3 ] && sleep 2
done
return 1
}

# Validate required environment variables
# Usage: validate_env_vars <var1> <var2> ...
# Returns: 0 if all variables are set, 1 otherwise
Expand Down Expand Up @@ -412,12 +427,7 @@ configure_collabora_app() {
execute_occ_command config:app:set richdocuments disable_certificate_verification --value="no"
fi

_prev_err="${_ERROR_COUNT}"
execute_occ_command richdocuments:activate-config
if [ "${_ERROR_COUNT}" -gt "${_prev_err}" ]; then
_ERROR_COUNT="${_prev_err}"
log_warning "richdocuments:activate-config failed — Collabora connectivity check is non-fatal. Configuration will be retried on next reconcile."
fi
}

# Configure notify_push app
Expand Down Expand Up @@ -496,7 +506,11 @@ configure_spreed_app() {
log_info "Configuring talk signaling server: ${HPB_URL}"

# Remove existing signaling servers
_server_list=$(execute_occ_command talk:signaling:list --output=json_pretty | jq -r '.servers[].server' 2>/dev/null | sort -u || echo "")
if ! retry_occ talk:signaling:list --output=json_pretty; then
log_error "Failed to retrieve signaling server list. Aborting signaling servers configuration"
return 1
fi
_server_list=$(echo "${_RETRY_OUTPUT}" | jq -r '.servers[].server' | sort -u)
echo "_server_list: $_server_list"

if [ -z "${_server_list}" ]; then
Expand All @@ -518,7 +532,13 @@ EOF
execute_occ_secret_command talk:signaling:add "${HPB_URL}" "${HPB_SECRET}"

# Configure TURN servers
turnList=$(php occ talk:turn:list --output=json_pretty 2>/dev/null || echo "")
# Propagate errors: if talk:turn:list fails we must not proceed, as we cannot
# safely determine which servers to delete before adding new ones.
if ! retry_occ talk:turn:list --output=json_pretty; then
log_error "Failed to retrieve TURN server list. Aborting TURN server configuration"
return 1
fi
turnList="${_RETRY_OUTPUT}"
if [ -n "${turnList}" ]; then
log_info "Existing TURN servers found. Proceeding with deletion..."
while IFS="$(printf '\t')" read -r _schemes _server _protocols; do
Expand All @@ -531,21 +551,11 @@ EOF
fi

log_info "Configuring new TURN server: ${TURN_SERVER_TCP_URL}"
_prev_err="${_ERROR_COUNT}"
execute_occ_secret_command talk:turn:add turn "${TURN_SERVER_TCP_URL}" tcp --secret "${TURN_SERVER_SECRET}"
if [ "${_ERROR_COUNT}" -gt "${_prev_err}" ]; then
_ERROR_COUNT="${_prev_err}"
log_warning "talk:turn:add (TCP) failed — TURN server configuration is non-fatal. Will be retried on next reconcile."
fi

if [ "${TURN_SERVER_UDP_URL}" ]; then
log_info "Configuring TURN server: ${TURN_SERVER_UDP_URL}"
_prev_err="${_ERROR_COUNT}"
execute_occ_secret_command talk:turn:add turn "${TURN_SERVER_UDP_URL}" udp --secret "${TURN_SERVER_SECRET}"
if [ "${_ERROR_COUNT}" -gt "${_prev_err}" ]; then
_ERROR_COUNT="${_prev_err}"
log_warning "talk:turn:add (UDP) failed — TURN server configuration is non-fatal. Will be retried on next reconcile."
fi
else
log_info "Skipping TURN server configuration (TURN_SERVER_UDP_URL not set)"
fi
Expand Down
Loading