From 86a36582f166b08c3e957cf3c2b7debb40c943b1 Mon Sep 17 00:00:00 2001 From: prateek banga Date: Thu, 19 Oct 2023 20:12:34 +0530 Subject: [PATCH] adds resque scheduler worker --- Dockerfile | 1 + bin/resque-scheduler | 10 ++++++++++ composer.lock | 12 ++++++------ docker-compose.yml | 23 +++++++++++++++++++++++ 4 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 bin/resque-scheduler diff --git a/Dockerfile b/Dockerfile index 8cea481543..10f6355604 100755 --- a/Dockerfile +++ b/Dockerfile @@ -93,6 +93,7 @@ RUN chmod +x /usr/local/bin/doctor && \ chmod +x /usr/local/bin/worker-builds && \ chmod +x /usr/local/bin/worker-mails && \ chmod +x /usr/local/bin/worker-messaging && \ + chmod +x /usr/local/bin/resque-scheduler && \ chmod +x /usr/local/bin/worker-webhooks && \ chmod +x /usr/local/bin/worker-migrations diff --git a/bin/resque-scheduler b/bin/resque-scheduler new file mode 100644 index 0000000000..95b5a3bc5b --- /dev/null +++ b/bin/resque-scheduler @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ] +then + export REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" +else + export REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" +fi + +INTERVAL=1 php /usr/src/code/vendor/bin/resque-scheduler -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/composer.lock b/composer.lock index e44b093609..c03b490609 100644 --- a/composer.lock +++ b/composer.lock @@ -2152,16 +2152,16 @@ }, { "name": "utopia-php/database", - "version": "0.44.1", + "version": "0.44.2", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "e0b832d217e4d429c96ade671e85ece942446543" + "reference": "591cadbc2c622a3304aae9a16ebfdbe75ef33a06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/e0b832d217e4d429c96ade671e85ece942446543", - "reference": "e0b832d217e4d429c96ade671e85ece942446543", + "url": "https://api.github.com/repos/utopia-php/database/zipball/591cadbc2c622a3304aae9a16ebfdbe75ef33a06", + "reference": "591cadbc2c622a3304aae9a16ebfdbe75ef33a06", "shasum": "" }, "require": { @@ -2202,9 +2202,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/0.44.1" + "source": "https://github.com/utopia-php/database/tree/0.44.2" }, - "time": "2023-10-18T07:05:41+00:00" + "time": "2023-10-19T07:39:00+00:00" }, { "name": "utopia-php/domains", diff --git a/docker-compose.yml b/docker-compose.yml index c8a7b6c64b..f27542c5c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -589,6 +589,29 @@ services: - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + appwrite-resque-scheduler: + entrypoint: resque-scheduler + <<: *x-logging + container_name: appwrite-resque-scheduler + restart: unless-stopped + image: appwrite-dev + networks: + - appwrite + volumes: + - ./app:/usr/src/code/app + - ./src:/usr/src/code/src + depends_on: + - redis + environment: + - _APP_ENV + - _APP_WORKER_PER_CORE + - _APP_REDIS_HOST + - _APP_REDIS_PORT + - _APP_REDIS_USER + - _APP_REDIS_PASS + - _APP_LOGGING_PROVIDER + - _APP_LOGGING_CONFIG + appwrite-worker-migrations: entrypoint: worker-migrations <<: *x-logging