CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-08 07:55:48 +12:00
Code Issues Projects Releases Wiki Activity

feat: put db and redis workers back in the pool

Browse source
This commit is contained in:
Christy Jacob 2022-01-28 16:26:22 +04:00
parent 3418c06bc8
commit a4e3eb07d8
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/executor.php
View file

@ -972,12 +972,13 @@ App::delete('/v1/functions/:functionId')
try { try {
$db = $register->get('dbPool')->get(); $db = $register->get('dbPool')->get();
$redis = $register->get('redisPool')->get(); $redis = $register->get('redisPool')->get();
$orchestration = $orchestrationPool->get();
$cache = new Cache(new RedisCache($redis)); $cache = new Cache(new RedisCache($redis));
$dbForProject = new Database(new MariaDB($db), $cache); $dbForProject = new Database(new MariaDB($db), $cache);
$dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$dbForProject->setNamespace('_project_' . $projectId); $dbForProject->setNamespace('_project_' . $projectId);
$orchestration = $orchestrationPool->get();
// Remove any ongoing builds // Remove any ongoing builds
if ($deployment->getAttribute('buildId')) { if ($deployment->getAttribute('buildId')) {
$build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId')); $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId'));
@ -996,6 +997,8 @@ App::delete('/v1/functions/:functionId')
Console::error($th->getMessage()); Console::error($th->getMessage());
} finally { } finally {
$orchestrationPool->put($orchestration); $orchestrationPool->put($orchestration);
$register->get('dbPool')->put($db);
$register->get('redisPool')->put($redis);
} }
}); });
} }
@ -1059,12 +1062,13 @@ App::delete('/v1/deployments/:deploymentId')
try { try {
$db = $register->get('dbPool')->get(); $db = $register->get('dbPool')->get();
$redis = $register->get('redisPool')->get(); $redis = $register->get('redisPool')->get();
$orchestration = $orchestrationPool->get();
$cache = new Cache(new RedisCache($redis)); $cache = new Cache(new RedisCache($redis));
$dbForProject = new Database(new MariaDB($db), $cache); $dbForProject = new Database(new MariaDB($db), $cache);
$dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$dbForProject->setNamespace('_project_' . $projectId); $dbForProject->setNamespace('_project_' . $projectId);
$orchestration = $orchestrationPool->get();
// Remove any ongoing builds // Remove any ongoing builds
if ($deployment->getAttribute('buildId')) { if ($deployment->getAttribute('buildId')) {
$build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId')); $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId'));
@ -1084,6 +1088,8 @@ App::delete('/v1/deployments/:deploymentId')
Console::error($th->getMessage()); Console::error($th->getMessage());
} finally { } finally {
$orchestrationPool->put($orchestration); $orchestrationPool->put($orchestration);
$register->get('dbPool')->put($db);
$register->get('redisPool')->put($redis);
} }
}); });