refactor: move cron-write to scheduler-cron-write
This commit is contained in:
8 files changed
+35
-27
No files matched your search
@@ -98,7 +98,7 @@ At this time, the following dokku commands are used to implement a complete sche
|
|||||||
- `apps:clone`: handles app cloning
|
- `apps:clone`: handles app cloning
|
||||||
- triggers: post-app-clone-setup
|
- triggers: post-app-clone-setup
|
||||||
- `cron`: generates cron tasks for the app
|
- `cron`: generates cron tasks for the app
|
||||||
- triggers: cron-write
|
- triggers: scheduler-cron-write
|
||||||
- `deploy`: deploys app proceses and checks the status of a deploy
|
- `deploy`: deploys app proceses and checks the status of a deploy
|
||||||
- triggers: scheduler-app-status, scheduler-deploy, scheduler-is-deployed, scheduler-logs-failed
|
- triggers: scheduler-app-status, scheduler-deploy, scheduler-is-deployed, scheduler-logs-failed
|
||||||
- `enter`: enters a running container
|
- `enter`: enters a running container
|
||||||
@@ -112,7 +112,9 @@ At this time, the following dokku commands are used to implement a complete sche
|
|||||||
- `run:logs`: fetches running container logs
|
- `run:logs`: fetches running container logs
|
||||||
- triggers: scheduler-run-logs
|
- triggers: scheduler-run-logs
|
||||||
- `ps:stop`: stops app processes
|
- `ps:stop`: stops app processes
|
||||||
- triggers: scheduler-stop
|
- triggers: scheduler-stop, scheduler-cron-write
|
||||||
|
- `ps:start`: starts app processes
|
||||||
|
- triggers: scheduler-deploy, scheduler-cron-write
|
||||||
- `ps:inspect`: outputs inspect output for processes in an app
|
- `ps:inspect`: outputs inspect output for processes in an app
|
||||||
- triggers: scheduler-inspect
|
- triggers: scheduler-inspect
|
||||||
|
|
||||||
|
|||||||
@@ -583,22 +583,6 @@ DOKKU_SCHEDULER="$1"
|
|||||||
# TODO
|
# TODO
|
||||||
```
|
```
|
||||||
|
|
||||||
### `cron-write`
|
|
||||||
|
|
||||||
- Description: Force triggers writing out cron entries
|
|
||||||
- Invoked by:
|
|
||||||
- Arguments:
|
|
||||||
- Example:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
|
||||||
|
|
||||||
# TODO
|
|
||||||
```
|
|
||||||
|
|
||||||
### `dependencies`
|
### `dependencies`
|
||||||
|
|
||||||
- Description: Used to install system-level dependencies.
|
- Description: Used to install system-level dependencies.
|
||||||
@@ -2445,6 +2429,26 @@ DOKKU_SCHEDULER="$1"; APP="$2";
|
|||||||
# TODO
|
# TODO
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### `scheduler-cron-write`
|
||||||
|
|
||||||
|
> [!WARNING]
|
||||||
|
> The scheduler plugin trigger apis are under development and may change
|
||||||
|
> between minor releases until the 1.0 release.
|
||||||
|
|
||||||
|
- Description: Force triggers writing out cron entries. Arguments are optional.
|
||||||
|
- Invoked by: `ps:start`, `ps:stop`, `cron:set`
|
||||||
|
- Arguments: `$DOKKU_SCHEDULER $APP`
|
||||||
|
- Example:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
|
||||||
|
# TODO
|
||||||
|
```
|
||||||
|
|
||||||
### `scheduler-deploy`
|
### `scheduler-deploy`
|
||||||
|
|
||||||
> [!WARNING]
|
> [!WARNING]
|
||||||
|
|||||||
@@ -130,8 +130,10 @@ func CommandSet(appName string, property string, value string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
common.CommandPropertySet("cron", appName, property, value, DefaultProperties, GlobalProperties)
|
common.CommandPropertySet("cron", appName, property, value, DefaultProperties, GlobalProperties)
|
||||||
|
scheduler := common.GetAppScheduler(appName)
|
||||||
_, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
|
_, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
Trigger: "cron-write",
|
Trigger: "scheduler-cron-write",
|
||||||
|
Args: []string{scheduler, appName},
|
||||||
StreamStdio: true,
|
StreamStdio: true,
|
||||||
})
|
})
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
TRIGGERS = triggers/cron-write
|
TRIGGERS = triggers/scheduler-cron-write
|
||||||
BUILD = triggers
|
BUILD = triggers
|
||||||
PLUGIN_NAME = scheduler-docker-local
|
PLUGIN_NAME = scheduler-docker-local
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ trigger-scheduler-docker-local-post-delete() {
|
|||||||
# remove all application containers
|
# remove all application containers
|
||||||
"$DOCKER_BIN" container ls --filter "label=com.dokku.app-name=${APP}" -q | xargs -n1 -I {} "$DOCKER_BIN" container rm --force {} &>/dev/null || true
|
"$DOCKER_BIN" container ls --filter "label=com.dokku.app-name=${APP}" -q | xargs -n1 -I {} "$DOCKER_BIN" container rm --force {} &>/dev/null || true
|
||||||
|
|
||||||
plugn trigger cron-write
|
plugn trigger scheduler-cron-write
|
||||||
}
|
}
|
||||||
|
|
||||||
trigger-scheduler-docker-local-post-delete "$@"
|
trigger-scheduler-docker-local-post-delete "$@"
|
||||||
@@ -7,7 +7,7 @@ trigger-scheduler-docker-local-post-deploy() {
|
|||||||
declare trigger="post-deploy"
|
declare trigger="post-deploy"
|
||||||
declare APP="$1"
|
declare APP="$1"
|
||||||
|
|
||||||
plugn trigger cron-write
|
plugn trigger scheduler-cron-write
|
||||||
}
|
}
|
||||||
|
|
||||||
trigger-scheduler-docker-local-post-deploy "$@"
|
trigger-scheduler-docker-local-post-deploy "$@"
|
||||||
@@ -18,7 +18,7 @@ func main() {
|
|||||||
|
|
||||||
var err error
|
var err error
|
||||||
switch trigger {
|
switch trigger {
|
||||||
case "cron-write":
|
case "scheduler-cron-write":
|
||||||
err = schedulerdockerlocal.TriggerCronWrite()
|
err = schedulerdockerlocal.TriggerCronWrite()
|
||||||
default:
|
default:
|
||||||
err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
|
err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ teardown() {
|
|||||||
echo "echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
echo "echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
|
|
||||||
run /bin/bash -c "dokku plugin:trigger cron-write"
|
run /bin/bash -c "dokku plugin:trigger scheduler-cron-write"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_success
|
assert_success
|
||||||
@@ -136,7 +136,7 @@ teardown() {
|
|||||||
echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
echo "echo '@daily;/bin/true;/var/log/dokku/log.log'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
|
|
||||||
run /bin/bash -c "dokku plugin:trigger cron-write"
|
run /bin/bash -c "dokku plugin:trigger scheduler-cron-write"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_success
|
assert_success
|
||||||
@@ -151,7 +151,7 @@ teardown() {
|
|||||||
echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
echo "[[ \$1 == 'docker-local' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
|
|
||||||
run /bin/bash -c "dokku plugin:trigger cron-write"
|
run /bin/bash -c "dokku plugin:trigger scheduler-cron-write"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_success
|
assert_success
|
||||||
@@ -166,7 +166,7 @@ teardown() {
|
|||||||
echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
echo "[[ \$1 == 'kubernetes' ]] && echo '@daily;/bin/true'" >/var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
chmod +x /var/lib/dokku/plugins/enabled/cron-entries/cron-entries
|
||||||
|
|
||||||
run /bin/bash -c "dokku plugin:trigger cron-write"
|
run /bin/bash -c "dokku plugin:trigger scheduler-cron-write"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_success
|
assert_success
|
||||||
|
|||||||
Reference in new issue
Block a user