Merge pull request #10035 from appwrite/revert-9890-PLA-2762

Revert "worker: Graceful shutdown on SIGTERM"

app/worker.php

@@ -18,9 +18,7 @@ use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
 use Executor\Executor;
-use Swoole\Process;
 use Swoole\Runtime;
-use Swoole\Timer;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
@@ -484,15 +482,8 @@ $worker
     });
 
 $worker->workerStart()
-    ->action(function () use ($worker, $workerName) {
-        Console::info("Worker $workerName started");
-
-        Process::signal(SIGTERM, function () use ($worker, $workerName) {
-            Console::info("Stopping worker $workerName.");
-
-            $worker->stop();
-            Timer::clearAll();
-        });
+    ->action(function () use ($workerName) {
+        Console::info("Worker $workerName  started");
     });
 
 $worker->start();

bin/doctor

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php doctor $@
+php /usr/src/code/app/cli.php doctor $@

bin/install

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php install $@
+php /usr/src/code/app/cli.php install $@

bin/maintenance

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php maintenance $@
+php /usr/src/code/app/cli.php maintenance $@

bin/migrate

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php migrate $@
+php /usr/src/code/app/cli.php migrate $@

bin/queue-count-failed

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php queue-count --type=failed $@
+php /usr/src/code/app/cli.php queue-count --type=failed $@

bin/queue-count-processing

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php queue-count --type=processing $@
+php /usr/src/code/app/cli.php queue-count --type=processing $@

bin/queue-count-success

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php queue-count --type=success $@
+php /usr/src/code/app/cli.php queue-count --type=success $@

bin/queue-retry

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php queue-retry $@
+php /usr/src/code/app/cli.php queue-retry $@

bin/realtime

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/realtime.php $@
+php /usr/src/code/app/realtime.php $@

bin/schedule-executions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php schedule-executions $@
+php /usr/src/code/app/cli.php schedule-executions $@

bin/schedule-functions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php schedule-functions $@
+php /usr/src/code/app/cli.php schedule-functions $@

bin/schedule-messages

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php schedule-messages $@
+php /usr/src/code/app/cli.php schedule-messages $@

bin/screenshot

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php screenshot $@
+php /usr/src/code/app/cli.php screenshot $@

bin/sdks

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php sdks $@
+php /usr/src/code/app/cli.php sdks $@

bin/specs

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php specs $@
+php /usr/src/code/app/cli.php specs $@

bin/ssl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php ssl $@
+php /usr/src/code/app/cli.php ssl $@

bin/stats-resources

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php stats-resources $@
+php /usr/src/code/app/cli.php stats-resources $@

bin/test

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@
+/usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@

bin/upgrade

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php upgrade $@
+php /usr/src/code/app/cli.php upgrade $@

bin/vars

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/cli.php vars $@
+php /usr/src/code/app/cli.php vars $@

bin/worker-audits

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php audits $@
+php /usr/src/code/app/worker.php audits $@

bin/worker-builds

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php builds $@
+php /usr/src/code/app/worker.php builds $@

bin/worker-certificates

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php certificates $@
+php /usr/src/code/app/worker.php certificates $@

bin/worker-databases

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php databases $@
+php /usr/src/code/app/worker.php databases $@

bin/worker-deletes

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php deletes $@
+php /usr/src/code/app/worker.php deletes $@

bin/worker-functions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php functions $@
+php /usr/src/code/app/worker.php functions $@

bin/worker-mails

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php mails $@
+php /usr/src/code/app/worker.php mails $@

bin/worker-messaging

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php messaging $@
+php /usr/src/code/app/worker.php messaging $@

bin/worker-migrations

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php migrations $@
+php /usr/src/code/app/worker.php migrations $@

bin/worker-stats-resources

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php stats-resources $@
+php /usr/src/code/app/worker.php stats-resources $@

bin/worker-stats-usage

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php stats-usage $@
+php /usr/src/code/app/worker.php stats-usage $@

bin/worker-webhooks

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php /usr/src/code/app/worker.php webhooks $@
+php /usr/src/code/app/worker.php webhooks $@

composer.json

@@ -67,7 +67,7 @@
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "0.8.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.11.*",
+        "utopia-php/queue": "0.11.0",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.18.*",
         "utopia-php/swoole": "0.8.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1557e469b3074a6478a0b2fd522e1a2a",
+    "content-hash": "55bc52686a08d64930e6af7411ac0654",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -4251,16 +4251,16 @@
         },
         {
             "name": "utopia-php/queue",
-            "version": "0.11.1",
+            "version": "0.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/queue.git",
-                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6"
+                "reference": "06b5ced0eaed2ecc6aab6d8e1b4d96bff37a1ce5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/queue/zipball/498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
-                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
+                "url": "https://api.github.com/repos/utopia-php/queue/zipball/06b5ced0eaed2ecc6aab6d8e1b4d96bff37a1ce5",
+                "reference": "06b5ced0eaed2ecc6aab6d8e1b4d96bff37a1ce5",
                 "shasum": ""
             },
             "require": {
@@ -4311,9 +4311,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/queue/issues",
-                "source": "https://github.com/utopia-php/queue/tree/0.11.1"
+                "source": "https://github.com/utopia-php/queue/tree/0.11.0"
             },
-            "time": "2025-05-30T11:50:34+00:00"
+            "time": "2025-05-30T09:52:38+00:00"
         },
         {
             "name": "utopia-php/registry",