CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-05 12:43:13 +13:00
Code Issues Projects Releases Wiki Activity

Fix worker tenant set/reset

Browse source
This commit is contained in:
Jake Barnby 2023-11-28 00:27:16 +13:00
parent b9ac8e644d
commit 68548ebd47
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/worker.php
View file

@ -72,9 +72,12 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
if ($project->getAttribute('shareTables')) { if ($project->getAttribute('shareTables')) {
$database $database
->setShareTables(true) ->setShareTables(true)
->setTenant($project->getId()); ->setTenant($project->getInternalId())
->setNamespace('');
} else { } else {
$database $database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId()); ->setNamespace('_' . $project->getInternalId());
} }
@ -94,14 +97,19 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if (isset($databases[$databaseName])) { if (isset($databases[$databaseName])) {
$database = $databases[$databaseName]; $database = $databases[$databaseName];
if ($project->getAttribute('shareTables')) { if ($project->getAttribute('shareTables')) {
$database $database
->setShareTables(true) ->setShareTables(true)
->setTenant($project->getId()); ->setTenant($project->getInternalId())
->setNamespace('');
} else { } else {
$database $database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId()); ->setNamespace('_' . $project->getInternalId());
} }
return $database; return $database;
} }
@ -117,9 +125,12 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if ($project->getAttribute('shareTables')) { if ($project->getAttribute('shareTables')) {
$database $database
->setShareTables(true) ->setShareTables(true)
->setTenant($project->getId()); ->setTenant($project->getInternalId())
->setNamespace('');
} else { } else {
$database $database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId()); ->setNamespace('_' . $project->getInternalId());
} }
@ -228,7 +239,7 @@ try {
* Any worker can be configured with the following env vars: * Any worker can be configured with the following env vars:
* - _APP_WORKERS_NUM The total number of worker processes * - _APP_WORKERS_NUM The total number of worker processes
* - _APP_WORKER_PER_CORE The number of worker processes per core (ignored if _APP_WORKERS_NUM is set) * - _APP_WORKER_PER_CORE The number of worker processes per core (ignored if _APP_WORKERS_NUM is set)
* - _APP_QUEUE_NAME The name of the queue to read for database events * - _APP_QUEUE_NAME The name of the queue to read for database events
*/ */
if ($workerName === 'databases') { if ($workerName === 'databases') {
$queueName = App::getEnv('_APP_QUEUE_NAME', 'database_db_main'); $queueName = App::getEnv('_APP_QUEUE_NAME', 'database_db_main');