CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-15 01:04:51 +12:00
Code Issues Projects Releases Wiki Activity

Move reconnection loop to first call to db

Browse source
This commit is contained in:
kodumbeats 2021-07-20 14:59:58 -04:00
parent 9870c6fdff
commit e16bfe7fd3
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/http.php
View file

@ -54,8 +54,23 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
$app = new App('UTC');
go(function() use ($register, $app) {
$db = $register->get('dbPool')->get();
$redis = $register->get('redisPool')->get();
// wait for database to be ready
$attempts = 0;
do {
try {
$attempts++;
$db = $register->get('dbPool')->get();
$redis = $register->get('redisPool')->get();
break; // leave the do-while if successful
} catch(\Exception $e) {
Console::warning("Database not ready. Retrying connection ({$attempts})...");
if ($attempts >= 10) {
throw new \Exception('Failed to connect to database: '. $e->getMessage());
}
sleep(1);
continue;
}
} while ($attempts < 10);
App::setResource('db', function () use (&$db) {
return $db;
@ -69,21 +84,7 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
return $app;
});
// wait for database to be ready
$attempts = 0;
do {
try {
$dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */
break; // leave the do-while if successful
} catch(\Exception $e) {
$attempts++;
Console::warning("Database not ready. Retrying connection ({$attempts})...");
if ($attempts >= 5) {
throw new \Exception('Failed to connect to database: '. $e->getMessage());
}
sleep(5);
}
} while (!$dbForConsole || $attempts < 5);
$dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */
if(!$dbForConsole->exists()) {
Console::success('[Setup] - Server database init started...');