From 8cde715d04027c4f7b9559c15b65ff19f4d7d7e1 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 15 Sep 2021 11:28:40 -0400 Subject: [PATCH 1/2] Use correct constant when deleting usage stats --- app/tasks/maintenance.php | 2 +- app/workers/deletes.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tasks/maintenance.php b/app/tasks/maintenance.php index fdfd7c942b..e0ef1adc01 100644 --- a/app/tasks/maintenance.php +++ b/app/tasks/maintenance.php @@ -42,7 +42,7 @@ $cli function notifyDeleteUsageStats(int $interval30m, int $interval1d) { Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [ - 'type' => DELETE_TYPE_USAGE_STATS, + 'type' => DELETE_TYPE_USAGE, 'timestamp1d' => time() - $interval1d, 'timestamp30m' => time() - $interval30m, ]); diff --git a/app/workers/deletes.php b/app/workers/deletes.php index f9571949f2..7016244f92 100644 --- a/app/workers/deletes.php +++ b/app/workers/deletes.php @@ -79,7 +79,7 @@ class DeletesV1 extends Worker $this->deleteCertificates($document); break; - case DELETE_TYPE_USAGE_STATS: + case DELETE_TYPE_USAGE: $this->deleteUsageStats($this->args['timestamp1d'], $this->args['timestamp30m']); break; default: From e90036f67451b3a52bdedc473b240f80c154deb7 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 15 Sep 2021 11:46:08 -0400 Subject: [PATCH 2/2] Exit tests if a container has status exited --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index a90890423c..325865fcd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,12 @@ install: script: - docker ps -a +# Tests should fail if any container is in exited status +- ALL_UP=`docker ps -aq --filter "status=exited"` +- > + if [[ "$ALL_UP" != "" ]]; then + exit 1 + fi - docker-compose logs appwrite - docker-compose logs mariadb - docker-compose logs appwrite-worker-functions