Merge pull request #3618 from dokku/3615-systemd-retire

Ensure the dokku-retire timer is properly installed
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2019-07-18 00:09:30 -04:00
commit b0b036549a
6 files changed
+44 -7

No files matched your search

+10 -4
View File
@@ -1,19 +1,25 @@
version: 2 version: 2
jobs: jobs:
build: build:
machine: true machine:
image: ubuntu-1604:201903-01
parallelism: 4 parallelism: 4
steps: steps:
- checkout - checkout
- run: |
if [[ "$(lsb_release -rs)" == "14.04" ]]; then
# dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
else
# dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to ens4
sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev ens4
fi
- run: | - run: |
make ci-dependencies make ci-dependencies
- run: | - run: |
./tests/ci/setup.sh ./tests/ci/setup.sh
- run: | - run: |
echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
- run: |
# dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
- run: | - run: |
case $CIRCLE_NODE_INDEX in case $CIRCLE_NODE_INDEX in
0) sudo -E make -e lint go-tests ci-go-coverage ;; 0) sudo -E make -e lint go-tests ci-go-coverage ;;
+8 -1
View File
@@ -38,7 +38,14 @@ fi
if [[ -d "$DOKKU_RSYSLOG_FILTER_DIR" && ! -f "$DOKKU_RSYSLOG_FILTER" ]]; then if [[ -d "$DOKKU_RSYSLOG_FILTER_DIR" && ! -f "$DOKKU_RSYSLOG_FILTER" ]]; then
cat >"$DOKKU_RSYSLOG_FILTER" <<EOF cat >"$DOKKU_RSYSLOG_FILTER" <<EOF
:syslogtag, contains, "dokku" $DOKKU_EVENTS_LOGFILE :syslogtag, contains, "dokku-event" $DOKKU_EVENTS_LOGFILE
EOF
flag_rsyslog_needs_restart=y
fi
if [[ -f "$DOKKU_RSYSLOG_FILTER" ]] && ! grep -q "dokku-event" "$DOKKU_RSYSLOG_FILTER"; then
cat >"$DOKKU_RSYSLOG_FILTER" <<EOF
:syslogtag, contains, "dokku-event" $DOKKU_EVENTS_LOGFILE
EOF EOF
flag_rsyslog_needs_restart=y flag_rsyslog_needs_restart=y
fi fi
+1 -1
View File
@@ -152,7 +152,7 @@ dokku_log_fail() {
dokku_log_event() { dokku_log_event() {
declare desc="log dokku events" declare desc="log dokku events"
logger -t dokku -i -- "$@" logger -t dokku-event -i -- "$@"
} }
dokku_log_plugn_trigger_call() { dokku_log_plugn_trigger_call() {
+6
View File
@@ -38,9 +38,15 @@ Description=Run dokku-retire.service every 5 minutes
[Timer] [Timer]
OnCalendar=*:0/5 OnCalendar=*:0/5
Persistent=true
[Install]
WantedBy=timers.target
EOF EOF
if command -v systemctl &>/dev/null; then if command -v systemctl &>/dev/null; then
systemctl --quiet reenable dokku-retire systemctl --quiet reenable dokku-retire
systemctl --quiet enable dokku-retire.timer
systemctl --quiet start dokku-retire.timer
fi fi
else else
cat <<EOF >/etc/cron.d/dokku-retire cat <<EOF >/etc/cron.d/dokku-retire
+1 -1
View File
@@ -27,7 +27,7 @@ install_dependencies() {
sudo add-apt-repository -y ppa:nginx/stable sudo add-apt-repository -y ppa:nginx/stable
sudo apt-get update sudo apt-get update
sudo apt-get -qq -y install nginx sudo apt-get -qq -y install cgroupfs-mount nginx
sudo cp "${ROOT_DIR}/tests/dhparam.pem" /etc/nginx/dhparam.pem sudo cp "${ROOT_DIR}/tests/dhparam.pem" /etc/nginx/dhparam.pem
sudo dpkg -i "${ROOT_DIR}/build/$HEROKUISH_PACKAGE_NAME" sudo dpkg -i "${ROOT_DIR}/build/$HEROKUISH_PACKAGE_NAME"
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/env bats
load test_helper
setup() {
global_setup
}
teardown() {
global_teardown
}
@test "(scheduler-docker-local) timer installed" {
run /bin/bash -c "systemctl list-timers | grep dokku-retire"
echo "output: $output"
echo "status: $status"
assert_success
}