From dbb05c46ba734bd438b291257cdeefdbf071eeb6 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 16 Nov 2022 11:38:01 +0530 Subject: [PATCH] fix: event triggers --- app/worker.php | 2 +- app/workers/functions.php | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/worker.php b/app/worker.php index 60e93b2518..c9074f6e20 100644 --- a/app/worker.php +++ b/app/worker.php @@ -69,7 +69,7 @@ Server::setResource('cache', function (Registry $register) { return new Cache(new Sharding($adapters)); }, ['register']); -Server::setResource('functions', function (Registry $register) { +Server::setResource('queueForFunctions', function (Registry $register) { $pools = $register->get('pools'); return new Func( $pools diff --git a/app/workers/functions.php b/app/workers/functions.php index e2a31afd75..bfa4421449 100644 --- a/app/workers/functions.php +++ b/app/workers/functions.php @@ -37,7 +37,7 @@ Server::setResource('execute', function () { Document $project, Document $function, Database $dbForProject, - Func $functions, + Func $queueForFunctions, string $trigger, string $executionId = null, string $event = null, @@ -213,7 +213,7 @@ Server::setResource('execute', function () { ->trigger(); /** Trigger Functions */ - $functions + $queueForFunctions ->setData($data ?? '') ->setProject($project) ->setUser($user) @@ -267,10 +267,10 @@ Server::setResource('execute', function () { $server->job() ->inject('message') ->inject('dbForProject') - ->inject('functions') + ->inject('queueForFunctions') ->inject('statsd') ->inject('execute') - ->action(function (Message $message, Database $dbForProject, Func $functions, Client $statsd, callable $execute) { + ->action(function (Message $message, Database $dbForProject, Func $queueForFunctions, Client $statsd, callable $execute) { $payload = $message->getPayload() ?? []; if (empty($payload)) { @@ -321,6 +321,7 @@ $server->job() dbForProject: $dbForProject, project: $project, function: $function, + queueForFunctions: $queueForFunctions, trigger: 'event', event: $events[0], eventData: $eventData, @@ -348,7 +349,7 @@ $server->job() project: $project, function: $function, dbForProject: $dbForProject, - functions: $functions, + queueForFunctions: $queueForFunctions, trigger: 'http', executionId: $execution->getId(), event: null, @@ -364,7 +365,7 @@ $server->job() project: $project, function: $function, dbForProject: $dbForProject, - functions: $functions, + queueForFunctions: $queueForFunctions, trigger: 'http', executionId: null, event: null,