Skip to content

Commit 7e110bf

Browse files
abnegateabnegate
authored
Revert "Feat: Make functions worker customizable"
1 parent 12d0853 commit 7e110bf

7 files changed

Lines changed: 6 additions & 26 deletions

File tree

‎app/cli.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,6 @@
194194
CLI::setResource('publisherDatabases', function (BrokerPool $publisher) {
195195
return $publisher;
196196
}, ['publisher']);
197-
CLI::setResource('publisherFunctions', function (BrokerPool $publisher) {
198-
return $publisher;
199-
}, ['publisher']);
200197
CLI::setResource('publisherMigrations', function (BrokerPool $publisher) {
201198
return $publisher;
202199
}, ['publisher']);

‎app/controllers/api/health.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,12 +686,12 @@
686686
contentType: ContentType::JSON
687687
))
688688
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
689-
->inject('publisherFunctions')
689+
->inject('publisher')
690690
->inject('response')
691-
->action(function (int|string $threshold, Publisher $publisherFunctions, Response $response) {
691+
->action(function (int|string $threshold, Publisher $publisher, Response $response) {
692692
$threshold = \intval($threshold);
693693

694-
$size = $publisherFunctions->getQueueSize(new Queue(Event::FUNCTIONS_QUEUE_NAME));
694+
$size = $publisher->getQueueSize(new Queue(Event::FUNCTIONS_QUEUE_NAME));
695695

696696
if ($size >= $threshold) {
697697
throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");

‎app/init/resources.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@
8383
App::setResource('publisherDatabases', function (BrokerPool $publisher) {
8484
return $publisher;
8585
}, ['publisher']);
86-
App::setResource('publisherFunctions', function (BrokerPool $publisher) {
87-
return $publisher;
88-
}, ['publisher']);
8986
App::setResource('publisherMigrations', function (BrokerPool $publisher) {
9087
return $publisher;
9188
}, ['publisher']);
@@ -98,9 +95,6 @@
9895
App::setResource('consumerDatabases', function (BrokerPool $consumer) {
9996
return $consumer;
10097
}, ['consumer']);
101-
App::setResource('consumerFunctions', function (BrokerPool $consumer) {
102-
return $consumer;
103-
}, ['consumer']);
10498
App::setResource('consumerMigrations', function (BrokerPool $consumer) {
10599
return $consumer;
106100
}, ['publisher']);

‎app/worker.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@
251251
return $publisher;
252252
}, ['publisher']);
253253

254-
Server::setResource('publisherFunctions', function (BrokerPool $publisher) {
255-
return $publisher;
256-
}, ['publisher']);
257-
258254
Server::setResource('publisherMigrations', function (BrokerPool $publisher) {
259255
return $publisher;
260256
}, ['publisher']);
@@ -271,10 +267,6 @@
271267
return $consumer;
272268
}, ['consumer']);
273269

274-
Server::setResource('consumerFunctions', function (BrokerPool $consumer) {
275-
return $consumer;
276-
}, ['consumer']);
277-
278270
Server::setResource('consumerMigrations', function (BrokerPool $consumer) {
279271
return $consumer;
280272
}, ['consumer']);

‎src/Appwrite/Platform/Tasks/ScheduleBase.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ abstract class ScheduleBase extends Action
2626

2727
protected BrokerPool $publisher;
2828
protected BrokerPool $publisherMigrations;
29-
protected BrokerPool $publisherFunctions;
3029

3130
private ?Histogram $collectSchedulesTelemetryDuration = null;
3231
private ?Gauge $collectSchedulesTelemetryCount = null;
@@ -46,7 +45,6 @@ public function __construct()
4645
->desc("Execute {$type}s scheduled in Appwrite")
4746
->inject('publisher')
4847
->inject('publisherMigrations')
49-
->inject('publisherFunctions')
5048
->inject('dbForPlatform')
5149
->inject('getProjectDB')
5250
->inject('telemetry')
@@ -69,14 +67,13 @@ protected function updateProjectAccess(Document $project, Database $dbForPlatfor
6967
* 2. Create timer that sync all changes from 'schedules' collection to local copy. Only reading changes thanks to 'resourceUpdatedAt' attribute
7068
* 3. Create timer that prepares coroutines for soon-to-execute schedules. When it's ready, coroutine sleeps until exact time before sending request to worker.
7169
*/
72-
public function action(BrokerPool $publisher, BrokerPool $publisherMigrations, BrokerPool $publisherFunctions, Database $dbForPlatform, callable $getProjectDB, Telemetry $telemetry): void
70+
public function action(BrokerPool $publisher, BrokerPool $publisherMigrations, Database $dbForPlatform, callable $getProjectDB, Telemetry $telemetry): void
7371
{
7472
Console::title(\ucfirst(static::getSupportedResource()) . ' scheduler V1');
7573
Console::success(APP_NAME . ' ' . \ucfirst(static::getSupportedResource()) . ' scheduler v1 has started');
7674

7775
$this->publisher = $publisher;
7876
$this->publisherMigrations = $publisherMigrations;
79-
$this->publisherFunctions = $publisherFunctions;
8077

8178
$this->scheduleTelemetryCount = $telemetry->createGauge('task.schedule.count');
8279
$this->collectSchedulesTelemetryDuration = $telemetry->createHistogram('task.schedule.collect_schedules.duration', 's');

‎src/Appwrite/Platform/Tasks/ScheduleExecutions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function enqueueResources(Database $dbForPlatform, callable $getProjec
3030
{
3131
$intervalEnd = (new \DateTime())->modify('+' . self::ENQUEUE_TIMER . ' seconds');
3232

33-
$queueForFunctions = new Func($this->publisherFunctions);
33+
$queueForFunctions = new Func($this->publisher);
3434

3535
foreach ($this->schedules as $schedule) {
3636
if (!$schedule['active']) {

‎src/Appwrite/Platform/Tasks/ScheduleFunctions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected function enqueueResources(Database $dbForPlatform, callable $getProjec
9090

9191
$this->updateProjectAccess($schedule['project'], $dbForPlatform);
9292

93-
$queueForFunctions = new Func($this->publisherFunctions);
93+
$queueForFunctions = new Func($this->publisher);
9494

9595
$queueForFunctions
9696
->setType('schedule')

0 commit comments

Comments
 (0)