fix: reference correct variable
This commit is contained in:
5 files changed
+5
-5
No files matched your search
@@ -38,7 +38,7 @@ Defaults to `60`.
|
|||||||
|
|
||||||
## Setting stop grace period
|
## Setting stop grace period
|
||||||
|
|
||||||
You can set the `stop-timeout` property on the `ps` plugin to change this value (default: `30`). See the [process management documentation](/docs/processes/process-management.md#changing-process-management-settings) for more information.
|
You can set the `stop-timeout-seconds` property on the `ps` plugin to change this value (default: `30`). See the [process management documentation](/docs/processes/process-management.md#changing-process-management-settings) for more information.
|
||||||
|
|
||||||
## Configuring check settings using the `config` plugin
|
## Configuring check settings using the `config` plugin
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ fn-scheduler-docker-local-retire-container() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout || true)"
|
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||||
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||||
|
|
||||||
if [[ "$STATE" == "restarting" ]]; then
|
if [[ "$STATE" == "restarting" ]]; then
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ trigger-scheduler-docker-local-scheduler-deploy() {
|
|||||||
local oldids=$(get_app_container_ids "$APP" "$PROCESS_TYPE")
|
local oldids=$(get_app_container_ids "$APP" "$PROCESS_TYPE")
|
||||||
|
|
||||||
DOKKU_NETWORK_BIND_ALL="$(plugn trigger network-get-property "$APP" bind-all-interfaces)"
|
DOKKU_NETWORK_BIND_ALL="$(plugn trigger network-get-property "$APP" bind-all-interfaces)"
|
||||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout)"
|
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds)"
|
||||||
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||||
|
|
||||||
DOKKU_START_CMD="$(config_get "$APP" DOKKU_START_CMD || true)"
|
DOKKU_START_CMD="$(config_get "$APP" DOKKU_START_CMD || true)"
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ trigger-scheduler-docker-local-scheduler-run-stop() {
|
|||||||
|
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
|
|
||||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout || true)"
|
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||||
if [[ -n "$CONTAINER_NAME" ]]; then
|
if [[ -n "$CONTAINER_NAME" ]]; then
|
||||||
fn-scheduler-docker-local-stop-container "$CONTAINER_NAME" "$DOKKU_DOCKER_STOP_TIMEOUT"
|
fn-scheduler-docker-local-stop-container "$CONTAINER_NAME" "$DOKKU_DOCKER_STOP_TIMEOUT"
|
||||||
return $?
|
return $?
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ trigger-scheduler-docker-local-scheduler-stop() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
|
DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
|
||||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout || true)"
|
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||||
|
|
||||||
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user