CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-05 14:40:42 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5620 from appwrite/fix-system-performance

Browse source 
Fix system performance
This commit is contained in:
Christy Jacob 2023-06-02 18:00:50 +05:30 committed by GitHub
parent cd8485fae4 36f1791a92
commit b68f601240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/console

@ -1 +1 @@
Subproject commit 3a0c8f0334d402a6e27c8b5c0512f3d60080ddbd
Subproject commit b981302dee30eab33e155af79f0088822b29a2b6

1
app/http.php
View file

@ -89,7 +89,6 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
try {
$cache = $app->getResource('cache'); /** @var Utopia\Cache\Cache $cache */
$cache->flush();
Console::success('[Setup] - Creating database: appwrite...');
$dbForConsole->create();
} catch (\Exception $e) {

13
app/workers/functions.php
View file

@ -265,8 +265,7 @@ $server->job()
while ($sum >= $limit) {
$functions = $dbForProject->find('functions', [
Query::limit($limit),
Query::offset($offset),
Query::orderAsc('name'),
Query::offset($offset)
]);
$sum = \count($functions);
@ -278,7 +277,15 @@ $server->job()
if (!array_intersect($events, $function->getAttribute('events', []))) {
continue;
}
Console::success('Iterating function: ' . $function->getAttribute('name'));
/** Skip if a function has been triggered by its own execution */
$event = "functions.{$function->getId()}.executions.*";
if (in_array($event, $events)) {
Console::warning("Skipping function: {$function->getAttribute('name')} from project: {$project->getId()} triggered by self");
continue;
}
Console::success("Iterating function: {$function->getAttribute('name')} from project: {$project->getId()}");
$execute(
log: $log,
statsd: $statsd,

13
src/Appwrite/Event/Validator/Event.php
View file

@ -7,6 +7,11 @@ use Utopia\Validator;
class Event extends Validator
{
/**
* @var string
*/
protected string $message = 'Event is not valid.';
/**
* Get Description.
*
@ -16,7 +21,7 @@ class Event extends Validator
*/
public function getDescription(): string
{
return 'Event is not valid.';
return $this->message;
}
/**
@ -40,6 +45,12 @@ class Event extends Validator
* Identify all sections of the pattern.
*/
$type = $parts[0] ?? false;
if ($type == 'functions') {
$this->message = 'Triggering a function on a function event is not allowed.';
return false;
}
$resource = $parts[1] ?? false;
$hasSubResource = $count > 3 && ($events[$type]['$resource'] ?? false) && ($events[$type][$parts[2]]['$resource'] ?? false);
$hasSubSubResource = $count > 5 && $hasSubResource && ($events[$type][$parts[2]][$parts[4]]['$resource'] ?? false);