This commit is contained in:
Jake Barnby 2025-04-17 17:09:08 +12:00
parent 100870557b
commit 70364d7a07
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
9 changed files with 31 additions and 32 deletions

View file

@ -10,8 +10,8 @@ use Appwrite\Event\StatsUsage;
use Appwrite\Platform\Appwrite;
use Appwrite\Runtimes\Runtimes;
use Executor\Executor;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Adapter\Pool as CachePool;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
use Utopia\CLI\CLI;
use Utopia\CLI\Console;

View file

@ -10,8 +10,8 @@ use Appwrite\SDK\Method;
use Appwrite\SDK\Response as SDKResponse;
use Appwrite\Utopia\Response;
use Utopia\App;
use Utopia\Config\Config;
use Utopia\Cache\Adapter as CacheAdapter;
use Utopia\Config\Config;
use Utopia\Database\Adapter as DatabaseAdapter;
use Utopia\Database\Document;
use Utopia\Domains\Validator\PublicDomain;

View file

@ -25,7 +25,6 @@ use Utopia\Audit\Audit;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Database\Adapter;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;

View file

@ -15,10 +15,10 @@ use Utopia\Audit\Audit;
use Utopia\CLI\Console;
use Utopia\Config\Config;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;

View file

@ -35,7 +35,6 @@ use Utopia\Logger\Log;
use Utopia\Logger\Logger;
use Utopia\Platform\Service;
use Utopia\Pools\Group;
use Utopia\Queue\Consumer;
use Utopia\Queue\Message;
use Utopia\Queue\Publisher;
use Utopia\Queue\Server;
@ -170,7 +169,7 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
$database->setTenant($project->getInternalId());
return $database;
}
$adapter = new DatabasePool($pools->get('logs'));
$database = new Database($adapter, $cache);

View file

@ -2,8 +2,8 @@
namespace Appwrite\Messaging\Adapter;
use Appwrite\PubSub\Adapter as PubSubAdapter;
use Appwrite\Messaging\Adapter as MessagingAdapter;
use Appwrite\PubSub\Adapter as PubSubAdapter;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
@ -142,7 +142,8 @@ class Realtime extends MessagingAdapter
global $register;
$register->get('pools')->get('pubsub')->use(fn (PubSubAdapter $redis) =>
$register->get('pools')->get('pubsub')->use(
fn (PubSubAdapter $redis) =>
$redis->publish('realtime', json_encode([
'project' => $projectId,
'roles' => $roles,

View file

@ -60,7 +60,7 @@ class ScheduleExecutions extends ScheduleBase
\go(function () use ($schedule, $delay, $data, $pools) {
Co::sleep($delay);
$pools->get('publisher')->use(function(Publisher $publisher) use ($schedule, $data) {
$pools->get('publisher')->use(function (Publisher $publisher) use ($schedule, $data) {
$queueForFunctions = new Func($publisher);
$queueForFunctions->setType('schedule')
@ -84,6 +84,6 @@ class ScheduleExecutions extends ScheduleBase
);
unset($this->schedules[$schedule['$internalId']]);
}
}
}
}

View file

@ -75,28 +75,28 @@ class ScheduleFunctions extends ScheduleBase
\sleep($delay); // in seconds
foreach ($scheduleKeys as $scheduleKey) {
// Ensure schedule was not deleted
if (!\array_key_exists($scheduleKey, $this->schedules)) {
return;
}
$schedule = $this->schedules[$scheduleKey];
$this->updateProjectAccess($schedule['project'], $dbForPlatform);
$pools->get('publisher')->use(function(Publisher $publisher) use ($schedule) {
$queueForFunctions = new Func($publisher);
$queueForFunctions
->setType('schedule')
->setFunction($schedule['resource'])
->setMethod('POST')
->setPath('/')
->setProject($schedule['project'])
->trigger();
});
foreach ($scheduleKeys as $scheduleKey) {
// Ensure schedule was not deleted
if (!\array_key_exists($scheduleKey, $this->schedules)) {
return;
}
$schedule = $this->schedules[$scheduleKey];
$this->updateProjectAccess($schedule['project'], $dbForPlatform);
$pools->get('publisher')->use(function (Publisher $publisher) use ($schedule) {
$queueForFunctions = new Func($publisher);
$queueForFunctions
->setType('schedule')
->setFunction($schedule['resource'])
->setMethod('POST')
->setPath('/')
->setProject($schedule['project'])
->trigger();
});
}
});
}

View file

@ -42,7 +42,7 @@ class ScheduleMessages extends ScheduleBase
}
\go(function () use ($schedule, $pools, $dbForPlatform) {
$pools->get('publisher')->use(function(Publisher $publisher) use ($schedule, $dbForPlatform) {
$pools->get('publisher')->use(function (Publisher $publisher) use ($schedule, $dbForPlatform) {
$queueForMessaging = new Messaging($publisher);
$this->updateProjectAccess($schedule['project'], $dbForPlatform);