fix: keep track of the stopped/started state of haproxy
This commit is contained in:
@@ -129,6 +129,7 @@ cmd-haproxy-start() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
|
fn-plugin-property-write "caddy" "--global" "proxy-status" "started"
|
||||||
fn-haproxy-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-haproxy-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p haproxy up -d --quiet-pull
|
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p haproxy up -d --quiet-pull
|
||||||
}
|
}
|
||||||
@@ -145,6 +146,7 @@ cmd-haproxy-stop() {
|
|||||||
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
|
||||||
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
|
||||||
|
|
||||||
|
fn-plugin-property-write "haproxy" "--global" "proxy-status" "stopped"
|
||||||
fn-haproxy-template-compose-file "$TMP_COMPOSE_FILE"
|
fn-haproxy-template-compose-file "$TMP_COMPOSE_FILE"
|
||||||
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p haproxy down --remove-orphans
|
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p haproxy down --remove-orphans
|
||||||
}
|
}
|
||||||
|
|||||||
20
plugins/haproxy-vhosts/pre-restore
Executable file
20
plugins/haproxy-vhosts/pre-restore
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/command-functions"
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
trigger-haproxy-pre-restore() {
|
||||||
|
declare desc="pre-restore the caddy proxy"
|
||||||
|
declare trigger="install"
|
||||||
|
|
||||||
|
if [[ "$(fn-plugin-property-get "haproxy" "--global" "proxy-status")" == "stopped" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! cmd-haproxy-start; then
|
||||||
|
dokku_log_warn "Failed to restore haproxy proxy, requests may not route as expected"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
trigger-haproxy-pre-restore "$@"
|
||||||
Reference in New Issue
Block a user