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

Tests fix

Browse source
This commit is contained in:
Matej Baco 2021-12-21 10:29:09 +01:00
parent 399cd9e38e
commit cba3618c35
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/http.php
View file

@ -10,6 +10,8 @@ use Swoole\Http\Request as SwooleRequest;
use Swoole\Http\Response as SwooleResponse;
use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Logger\Log;
use Utopia\Logger\Log\User;
use Utopia\Swoole\Files;
use Utopia\Swoole\Request;
@ -99,6 +101,9 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
Console::error('[Error] File: '.$th->getFile());
Console::error('[Error] Line: '.$th->getLine());
$code = $th->getCode();
$swooleResponse->setStatusCode($code);
/**
* Reset Database connection if PDOException was thrown.
*/

14
app/realtime.php
View file

@ -139,7 +139,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId,
/**
* Save current connections to the Database every 5 seconds.
*/
Timer::tick(5000, function () use ($stats, $getConsoleDb, $containerId, &$documentId, $register) {
Timer::tick(5000, function () use ($stats, $getConsoleDb, $containerId, &$documentId, $register, $logError) {
foreach ($stats as $projectId => $value) {
if (empty($value['connections']) && empty($value['messages'])) {
continue;
@ -190,7 +190,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId,
'value' => json_encode($payload)
]);
} catch (\Throwable $th) {
logError($register, $th, "updateWorkerDocument");
call_user_func($logError, $th, "updateWorkerDocument");
Console::error('[Error] Type: ' . get_class($th));
Console::error('[Error] Message: ' . $th->getMessage());
@ -202,13 +202,13 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId,
});
});
$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime, $logError) {
Console::success('Worker ' . $workerId . ' started succefully');
$attempts = 0;
$start = time();
Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
Timer::tick(5000, function () use ($server, $register, $realtime, $stats, $logError) {
/**
* Sending current connections to project channels on the console project every 5 seconds.
*/
@ -365,7 +365,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
}
});
} catch (\Throwable $th) {
logError($register, $th, "pubSubConnection");
call_user_func($logError, $th, "pubSubConnection");
Console::error('Pub/sub error: ' . $th->getMessage());
$register->get('redisPool')->put($redis);
@ -379,7 +379,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
Console::error('Failed to restart pub/sub...');
});
$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $logError) {
$app = new App('UTC');
$request = new Request($request);
$response = new Response(new SwooleResponse());
@ -483,7 +483,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
$stats->incr($project->getId(), 'connections');
$stats->incr($project->getId(), 'connectionsTotal');
} catch (\Throwable $th) {
logError($register, $th, "initServer");
call_user_func($logError, $th, "initServer");
$response = [
'type' => 'error',

2
composer.json
View file

@ -53,7 +53,7 @@
"utopia-php/domains": "1.1.*",
"utopia-php/swoole": "0.2.*",
"utopia-php/storage": "0.5.*",
"utopia-php/websocket": "dev-feat-onerror-callback",
"utopia-php/websocket": "0.1.0",
"utopia-php/image": "0.5.*",
"resque/php-resque": "1.3.6",
"matomo/device-detector": "4.3.1",

18
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "269b7f80dd8bd8f7fd0e78432da13b12",
"content-hash": "1a20aaab4a5e2858c4088865be641035",
"packages": [
{
"name": "adhocore/jwt",
@ -2451,16 +2451,16 @@
},
{
"name": "utopia-php/websocket",
"version": "dev-feat-onerror-callback",
"version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/websocket.git",
"reference": "237eed7e9c54a514cfabac3e5726d24661254f2e"
"reference": "51fcb86171400d8aa40d76c54593481fd273dab5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/websocket/zipball/237eed7e9c54a514cfabac3e5726d24661254f2e",
"reference": "237eed7e9c54a514cfabac3e5726d24661254f2e",
"url": "https://api.github.com/repos/utopia-php/websocket/zipball/51fcb86171400d8aa40d76c54593481fd273dab5",
"reference": "51fcb86171400d8aa40d76c54593481fd273dab5",
"shasum": ""
},
"require": {
@ -2503,9 +2503,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/websocket/issues",
"source": "https://github.com/utopia-php/websocket/tree/feat-onerror-callback"
"source": "https://github.com/utopia-php/websocket/tree/0.1.0"
},
"time": "2021-11-29T08:43:24+00:00"
"time": "2021-12-20T10:50:09+00:00"
},
{
"name": "webmozart/assert",
@ -6467,9 +6467,7 @@
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"utopia-php/websocket": 20
},
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {

1
src/Appwrite/Resque/Worker.php
View file

@ -3,7 +3,6 @@
namespace Appwrite\Resque;
use Exception;
use function var_dump;
class Worker
{