refill pools on exception
This commit is contained in:
parent
084b4e8c08
commit
adf3f74ef2
1 changed files with 28 additions and 10 deletions
38
app/cli.php
38
app/cli.php
|
@ -47,11 +47,20 @@ function getConsoleDB(): Database
|
||||||
|
|
||||||
$pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
|
$pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
|
||||||
|
|
||||||
$dbAdapter = $pools
|
try {
|
||||||
->get('console')
|
$dbAdapter = $pools
|
||||||
->pop()
|
->get('console')
|
||||||
->getResource()
|
->pop()
|
||||||
;
|
->getResource()
|
||||||
|
;
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
$pools->fill();
|
||||||
|
$dbAdapter = $pools
|
||||||
|
->get('console')
|
||||||
|
->pop()
|
||||||
|
->getResource()
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
$database = new Database($dbAdapter, getCache());
|
$database = new Database($dbAdapter, getCache());
|
||||||
|
|
||||||
|
@ -71,11 +80,20 @@ function getProjectDB(Document $project): Database
|
||||||
return getConsoleDB();
|
return getConsoleDB();
|
||||||
}
|
}
|
||||||
|
|
||||||
$dbAdapter = $pools
|
try {
|
||||||
->get($project->getAttribute('database'))
|
$dbAdapter = $pools
|
||||||
->pop()
|
->get($project->getAttribute('database'))
|
||||||
->getResource()
|
->pop()
|
||||||
;
|
->getResource()
|
||||||
|
;
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
$pools->fill();
|
||||||
|
$dbAdapter = $pools
|
||||||
|
->get($project->getAttribute('database'))
|
||||||
|
->pop()
|
||||||
|
->getResource()
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
$database = new Database($dbAdapter, getCache());
|
$database = new Database($dbAdapter, getCache());
|
||||||
$database->setNamespace('_' . $project->getInternalId());
|
$database->setNamespace('_' . $project->getInternalId());
|
||||||
|
|
Loading…
Reference in a new issue