github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

refactor: standardize trigger code

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-10 02:40:59 -05:00
parent 4a60497d3e
commit 7357579af2
63 changed files with 382 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/scheduler-docker-local/check-deploy
View File

@@ -39,14 +39,10 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/checks/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-check-deploy() {
trigger-scheduler-docker-local-check-deploy() {
declare desc="scheduler-docker-local check-deploy plugin trigger"
local trigger="scheduler-docker-local-check-deploy"
local APP="$1"
local DOKKU_APP_CONTAINER_ID="$2"
local DOKKU_APP_CONTAINER_TYPE="$3"
local DOKKU_APP_LISTEN_PORT="$4"
local DOKKU_APP_LISTEN_IP="$5"
declare trigger="check-deploy"
declare APP="$1" DOKKU_APP_CONTAINER_ID="$2" DOKKU_APP_CONTAINER_TYPE="$3" DOKKU_APP_LISTEN_PORT="$4" DOKKU_APP_LISTEN_IP="$5"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -242,4 +238,4 @@ scheduler-docker-local-check-deploy() {
dokku_log_verbose "All checks successful!"
}
scheduler-docker-local-check-deploy "$@"
trigger-scheduler-docker-local-check-deploy "$@"

6
plugins/scheduler-docker-local/core-post-deploy
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-core-post-deploy() {
trigger-scheduler-docker-local-core-post-deploy() {
declare desc="scheduler-docker-local core-post-deploy state cleanup"
declare trigger="scheduler-docker-local core-post-deploy"
declare trigger="core-post-deploy"
declare APP="$1"
local APP_ROOT="$DOKKU_ROOT/$APP"
@@ -62,4 +62,4 @@ scheduler-docker-local-core-post-deploy() {
shopt -u nullglob
}
scheduler-docker-local-core-post-deploy "$@"
trigger-scheduler-docker-local-core-post-deploy "$@"

6
plugins/scheduler-docker-local/install
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
scheduler-docker-local-install() {
trigger-scheduler-docker-local-install() {
declare desc="scheduler-docker-local install plugin trigger"
declare trigger="scheduler-docker-local-install"
declare trigger="install"
local DOKKU_PATH
mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local"
@@ -58,4 +58,4 @@ EOF
fi
}
scheduler-docker-local-install "$@"
trigger-scheduler-docker-local-install "$@"

5
plugins/scheduler-docker-local/post-app-clone-setup
View File

@@ -2,12 +2,13 @@
set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
scheduler-docker-local-post-app-clone-setup() {
trigger-scheduler-docker-local-post-app-clone-setup() {
declare desc="removes docker-local files when setting up a clone"
declare trigger="post-app-clone-setup"
declare OLD_APP="$1" NEW_APP="$2"
local APP_DIR="$DOKKU_ROOT/$NEW_APP"
find "$APP_DIR" -type f -name 'CONTAINER.*' -exec rm {} \;
}
scheduler-docker-local-post-app-clone-setup "$@"
trigger-scheduler-docker-local-post-app-clone-setup "$@"

6
plugins/scheduler-docker-local/post-create
View File

@@ -2,13 +2,13 @@
set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
scheduler-docker-local-post-create() {
trigger-scheduler-docker-local-post-create() {
declare desc="scheduler-docker-local post-create plugin trigger"
declare trigger="scheduler-docker-local-post-create"
declare trigger="post-create"
declare APP="$1"
mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/${APP}"
chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/${APP}"
}
scheduler-docker-local-post-create "$@"
trigger-scheduler-docker-local-post-create "$@"

6
plugins/scheduler-docker-local/post-delete
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-post-delete() {
trigger-scheduler-docker-local-post-delete() {
declare desc="scheduler-docker-local post-delete plugin trigger"
declare trigger="scheduler-docker-local post-delete"
declare trigger="post-delete"
declare APP="$1"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
@@ -28,4 +28,4 @@ scheduler-docker-local-post-delete() {
"$DOCKER_BIN" image rm $("$DOCKER_BIN" image list --quiet "$IMAGE_REPO" | xargs) &>/dev/null || true
}
scheduler-docker-local-post-delete "$@"
trigger-scheduler-docker-local-post-delete "$@"

6
plugins/scheduler-docker-local/pre-deploy
View File

@@ -5,9 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-pre-deploy() {
trigger-scheduler-docker-local-pre-deploy() {
declare desc="scheduler-docker-local pre-deploy plugin trigger"
declare trigger="scheduler-docker-local pre-deploy"
declare trigger="pre-deploy"
declare APP="$1" IMAGE_TAG="$2"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
@@ -70,4 +70,4 @@ scheduler-docker-local-pre-deploy-precheck() {
fi
}
scheduler-docker-local-pre-deploy "$@"
trigger-scheduler-docker-local-pre-deploy "$@"

6
plugins/scheduler-docker-local/pre-restore
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-pre-restore() {
trigger-scheduler-docker-local-pre-restore() {
declare desc="scheduler-docker-local pre-restore plugin trigger"
declare trigger="scheduler-docker-local pre-restore"
declare trigger="pre-restore"
declare DOKKU_SCHEDULER="$1"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -17,4 +17,4 @@ scheduler-docker-local-pre-restore() {
"$DOCKER_BIN" container rm $("$DOCKER_BIN" container list --all --format "{{.Names}}" --filter "label=$DOKKU_CONTAINER_LABEL" --quiet | grep -E '(.+\..+\.[0-9]+\.[0-9]+$)') &>/dev/null || true
}
scheduler-docker-local-pre-restore "$@"
trigger-scheduler-docker-local-pre-restore "$@"

6
plugins/scheduler-docker-local/scheduler-app-status
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-app-status() {
trigger-scheduler-app-status() {
declare desc="fetches the status for a given app"
declare trigger="scheduler-docker-local scheduler-app-status"
declare trigger="scheduler-app-status"
declare DOKKU_SCHEDULER="$1" APP="$2"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -35,4 +35,4 @@ scheduler-app-status() {
echo "$PROCS $RUNNING"
}
scheduler-app-status "$@"
trigger-scheduler-app-status "$@"

6
plugins/scheduler-docker-local/scheduler-deploy
View File

@@ -7,9 +7,9 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/ps/functions"
source "$PLUGIN_AVAILABLE_PATH/scheduler-docker-local/internal-functions"
scheduler-docker-local-scheduler-deploy() {
trigger-scheduler-docker-local-scheduler-deploy() {
declare desc="deploys an image tag for a given application"
declare trigger="scheduler-docker-local scheduler-deploy"
declare trigger="scheduler-deploy"
declare DOKKU_SCHEDULER="$1" APP="$2" IMAGE_TAG="$3"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -220,4 +220,4 @@ fn-scheduler-docker-local-extract-start-cmd() {
echo "$START_CMD"
}
scheduler-docker-local-scheduler-deploy "$@"
trigger-scheduler-docker-local-scheduler-deploy "$@"

6
plugins/scheduler-docker-local/scheduler-docker-cleanup
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-scheduler-docker-cleanup() {
trigger-scheduler-docker-local-scheduler-docker-cleanup() {
declare desc="scheduler-docker-local scheduler-docker-cleanup plugin trigger"
declare trigger="scheduler-docker-local scheduler-docker-cleanup"
declare trigger="scheduler-docker-cleanup"
declare DOKKU_SCHEDULER="$1" APP="$2" FORCE_CLEANUP="$3"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -42,4 +42,4 @@ scheduler-docker-local-scheduler-docker-cleanup() {
fi
}
scheduler-docker-local-scheduler-docker-cleanup "$@"
trigger-scheduler-docker-local-scheduler-docker-cleanup "$@"

6
plugins/scheduler-docker-local/scheduler-inspect
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-scheduler-inspect() {
trigger-scheduler-docker-local-scheduler-inspect() {
declare desc="scheduler-docker-local scheduler-inspect plugin trigger"
declare trigger="scheduler-docker-local scheduler-inspect"
declare trigger="scheduler-inspect"
declare DOKKU_SCHEDULER="$1" APP="$2"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -60,4 +60,4 @@ EOF
}
scheduler-docker-local-scheduler-inspect "$@"
trigger-scheduler-docker-local-scheduler-inspect "$@"

5
plugins/scheduler-docker-local/scheduler-is-deployed
View File

@@ -2,8 +2,9 @@
set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
scheduler-docker-local-scheduler-is-deployed() {
trigger-scheduler-docker-local-scheduler-is-deployed() {
declare desc="checks if an app is deployed"
declare trigger="scheduler-is-deployed"
declare DOKKU_SCHEDULER="$1" APP="$2"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -20,4 +21,4 @@ scheduler-docker-local-scheduler-is-deployed() {
return 1
}
scheduler-docker-local-scheduler-is-deployed "$@"
trigger-scheduler-docker-local-scheduler-is-deployed "$@"

6
plugins/scheduler-docker-local/scheduler-logs
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-scheduler-logs() {
trigger-scheduler-docker-local-scheduler-logs() {
declare desc="scheduler-docker-local scheduler-logs plugin trigger"
declare trigger="scheduler-docker-local scheduler-logs"
declare trigger="scheduler-logs"
declare DOKKU_SCHEDULER="$1" APP="$2" PROCESS_TYPE="$3" TAIL="$4" PRETTY_PRINT="$5" NUM="$6"
local DOKKU_LOGS_ARGS=""
@@ -47,4 +47,4 @@ scheduler-docker-local-scheduler-logs() {
bash -c "($DOKKU_LOGS_CMD)"
}
scheduler-docker-local-scheduler-logs "$@"
trigger-scheduler-docker-local-scheduler-logs "$@"

6
plugins/scheduler-docker-local/scheduler-logs-failed
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-scheduler-logs-failed() {
trigger-scheduler-docker-local-scheduler-logs-failed() {
declare desc="scheduler-docker-local scheduler-logs-failed plugin trigger"
declare trigger="scheduler-docker-local scheduler-logs-failed"
declare trigger="scheduler-logs-failed"
declare DOKKU_SCHEDULER="$1" APP="$2"
local FAILED_CONTAINERS_FILE="${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
local DEAD_CONTAINERS=() DOKKU_LOGS_CMD=() RUNNING_CONTAINERS=()
@@ -54,4 +54,4 @@ scheduler-docker-local-scheduler-logs-failed() {
bash -c "($DOKKU_LOGS_CMD)"
}
scheduler-docker-local-scheduler-logs-failed "$@"
trigger-scheduler-docker-local-scheduler-logs-failed "$@"

6
plugins/scheduler-docker-local/scheduler-retire
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/scheduler-docker-local/internal-functions"
scheduler-docker-local-scheduler-retire() {
trigger-scheduler-docker-local-scheduler-retire() {
declare desc="retires all old containers once they have aged out"
declare trigger="scheduler-docker-local scheduler-retire"
declare trigger="scheduler-retire"
local DEAD_CONTAINER_FILE="${DOKKU_LIB_ROOT}/data/scheduler-docker-local/dead-containers"
local APP CID CURRENT_TIME DEAD_TIME STATE
@@ -52,4 +52,4 @@ scheduler-docker-local-scheduler-retire() {
done
}
scheduler-docker-local-scheduler-retire "$@"
trigger-scheduler-docker-local-scheduler-retire "$@"

6
plugins/scheduler-docker-local/scheduler-run
View File

@@ -5,9 +5,9 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/ps/functions"
scheduler-docker-local-scheduler-run() {
trigger-scheduler-docker-local-scheduler-run() {
declare desc="runs command in container based on app image"
declare trigger="scheduler-docker-local scheduler-run"
declare trigger="scheduler-run"
declare DOKKU_SCHEDULER="$1" APP="$2" ENV_COUNT="$3"
local CONTAINER_ID
shift 3
@@ -98,4 +98,4 @@ scheduler-docker-local-scheduler-run() {
return "$DOKKU_CONTAINER_EXIT_CODE"
}
scheduler-docker-local-scheduler-run "$@"
trigger-scheduler-docker-local-scheduler-run "$@"

6
plugins/scheduler-docker-local/scheduler-stop
View File

@@ -4,9 +4,9 @@ set -eo pipefail
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions"
scheduler-docker-local-scheduler-stop() {
trigger-scheduler-docker-local-scheduler-stop() {
declare desc="scheduler-docker-local scheduler-stop plugin trigger"
declare trigger="scheduler-docker-local scheduler-stop"
declare trigger="scheduler-stop"
declare DOKKU_SCHEDULER="$1" APP="$2" REMOVE_CONTAINERS="$3"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -37,4 +37,4 @@ scheduler-docker-local-scheduler-stop() {
fi
}
scheduler-docker-local-scheduler-stop "$@"
trigger-scheduler-docker-local-scheduler-stop "$@"

6
plugins/scheduler-docker-local/scheduler-tags-create
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-scheduler-tags-create() {
trigger-scheduler-docker-local-scheduler-tags-create() {
declare desc="scheduler-docker-local scheduler-tags-create plugin trigger"
declare trigger="scheduler-docker-local scheduler-tags-create"
declare trigger="scheduler-tags-create"
declare DOKKU_SCHEDULER="$1" APP="$2" SOURCE_IMAGE="$3" TARGET_IMAGE="$4"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -34,4 +34,4 @@ is_tag_force_available() {
fi
}
scheduler-docker-local-scheduler-tags-create "$@"
trigger-scheduler-docker-local-scheduler-tags-create "$@"

6
plugins/scheduler-docker-local/scheduler-tags-destroy
View File

@@ -3,9 +3,9 @@ set -eo pipefail
[[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
scheduler-docker-local-scheduler-tags-destroy() {
trigger-scheduler-docker-local-scheduler-tags-destroy() {
declare desc="scheduler-docker-local scheduler-tags-destroy plugin trigger"
declare trigger="scheduler-docker-local scheduler-tags-destroy"
declare trigger="scheduler-tags-destroy"
declare DOKKU_SCHEDULER="$1" APP="$2" IMAGE_REPO="$3" IMAGE_TAG="$4"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
@@ -15,4 +15,4 @@ scheduler-docker-local-scheduler-tags-destroy() {
"$DOCKER_BIN" image rm "$IMAGE_REPO:$IMAGE_TAG"
}
scheduler-docker-local-scheduler-tags-destroy "$@"
trigger-scheduler-docker-local-scheduler-tags-destroy "$@"