From b72b2ffc8cd2a7e57a5d92e811e2bfa768dec80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 11 Jul 2023 10:53:40 +0200 Subject: [PATCH] Improve error page --- .env | 40 ++++++++++++++++++++++++++++++------- app/controllers/general.php | 19 ++++++++++-------- app/workers/builds.php | 1 - 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/.env b/.env index fdb8dddd95..d864bb66db 100644 --- a/.env +++ b/.env @@ -57,7 +57,7 @@ _APP_STORAGE_PREVIEW_LIMIT=20000000 _APP_FUNCTIONS_SIZE_LIMIT=30000000 _APP_FUNCTIONS_TIMEOUT=900 _APP_FUNCTIONS_BUILD_TIMEOUT=900 -_APP_FUNCTIONS_CPUS=1 +_APP_FUNCTIONS_CPUS=4 _APP_FUNCTIONS_MEMORY=512 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600 @@ -81,9 +81,35 @@ _APP_DOCKER_HUB_USERNAME= _APP_DOCKER_HUB_PASSWORD= _APP_CONSOLE_GITHUB_SECRET= _APP_CONSOLE_GITHUB_APP_ID= -VCS_GITHUB_APP_NAME= -VCS_GITHUB_PRIVATE_KEY="" -VCS_GITHUB_APP_ID= -VCS_GITHUB_CLIENT_ID= -VCS_GITHUB_CLIENT_SECRET= -VCS_GITHUB_WEBHOOK_SECRET= \ No newline at end of file +VCS_GITHUB_APP_NAME=appwrite-generated-on-22-5-2023 +VCS_GITHUB_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA6H/oWcYg9Kpx9YNTaSDsmkREGRtbZ3UytG4xAaGJynaCBBSN +Pb+9X8btwm78E8a9RKXNFnGe4ril1rrqI3g9fKypCWj4a6uAKgVS3wV3H3HIVsVC +LZg2BhqlcVGQ5GQ5tPt743XEGrV1ObjEGpQlgW4bl5JUDjx3OgLqxtr861XqM2T7 +ibnREy5zA8Jxq9lh1TbiEvKQ4wN+yz2KmKOYwqSlfy3CoI/TGzdymRCEGSzKymFA +DSoIp3TjLA6jAhG6Q04jfMLE8unJrIx/wKtDdS0GDprHpE/8BTv3EktR54OiodIG +yPopdpLpM+5e6Edba1ZpsQqAxguCu49ZvgIHOQIDAQABAoIBAQDHie8qDSb/lMEV +Ss5tbXpis7AWNCpwUl9gByo8Eh2mC6tuQQ0vL74h0yL/Oi1R88FAh2PKnV0VjA+Y +iPal1m4+8BhrIRIDpj7q0YLcMV6ZOBgOkGFJrFbBSmEvLifCPFpif2tGPi4+Ffoz +veVgQkEmIg/AOC+3wCE7QoGohQ2IEqNWmV/q70kwUSd583hSu/0WoMwarMxzh1C2 +VV9uhhh/zsBfUgYdtbMao+8qpwmaRRw5lpMur23dGdJDRpSVB90w/DX8BJoP+i5g +8iBulIaD33JTrSlOshnV7e0PUnXteQNVmmn4LAQW8SinnTHmxhwtQdWm4QOoItS5 +ykJ+or0BAoGBAPyY6vPBe2Gbx6zZ9UuPCoHSv6+Kfcmvi8jGKBqCWlb1dPO7Sxh8 +ffI0kYssrhbO2w3uPMA7MiKHt7dH/TdLnQ5nRTkOzhnEIMEDvGvouNXMZ1sPKKtR +uRnZ4WyDWCUtqkYtFldIGOni93Ea19JXN9UzBlefFQLagrHibL/TvX/JAoGBAOuh +rtMe5dGD5eyEiybd/N9lnVXIIGqtkMLR8YTcOu7+Pr2ZPJXXu+hF0qw73YFyfKx4 +ufutXOk1GtVx7rP7b21T+hnYZuseYXywRlzvtdED6QXI5QL9b0rszxcCjvubcPKT +5LbRyUeANmbc3TsDoRonUVKY3prVqsinHEOromPxAoGAAa4ywfRjkb6rkWbRzvLg +qwRv6gcN1y2nzGolEigT2chAQu7YDQ2m+NmIrlhZwCUYJ/uRw+Wg68HjYwDDmn6S +SOo+96Y1kM5ROXeA5Wbi8+ksNtre9mTQym88pLArAfRP0a+zGlmMcOHlq4b2MJwL +7wsr26FfTmmNvQk4l/4coKECgYEAxVZFOd64jf0uxCRE/aoQK2/IkpzmOTFe+Som +YSSn3pvjI5qAGOXyIxbG1yPT4KNnMnJxIAwSseSdsoCWbvl2WlNoM9j+aI6rCmf+ +pbrDxGbH8uZKlXR2joNA9H5aDPIjZ6TgeRO8xDrmVMNILDJf661d+BS66WVkgGMj +0rCdcaECgYEAlEty+bq32FFUh1lQgtphXFMVswHGfI/kIAPSOjKdl1d7GFhI1VUq +cfplMcOuhuyGVPuIdzCTmegpxrmhg8Oh7455BpaXHl+9SZdgbmoHy69TZGnt0qdp +MtSkV+8MiNAuyhYsIKj5QCyLCY0LY3elcou5RSSwI3zC/6n44G0BuyY= +-----END RSA PRIVATE KEY-----" +VCS_GITHUB_APP_ID=337303 +VCS_GITHUB_CLIENT_ID=Iv1.306ee38582d3f948 +VCS_GITHUB_CLIENT_SECRET=0dd12cb631b37056e5ee89e0466cbfba24884db1 +VCS_GITHUB_WEBHOOK_SECRET=4ae0440e0a311cd4b33a702ebf27e5791de30050 \ No newline at end of file diff --git a/app/controllers/general.php b/app/controllers/general.php index e6b52d2d74..063ef9aebc 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -43,8 +43,10 @@ Config::setParam('domainVerification', false); Config::setParam('cookieDomain', 'localhost'); Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE); -function router(Database $dbForConsole, SwooleRequest $swooleRequest, Response $response) +function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleRequest, Response $response) { + $utopia->getRoute()->label('error', __DIR__ . '/../views/general/error.phtml'); + $host = $swooleRequest->header['host'] ?? ''; $route = Authorization::skip( @@ -118,14 +120,12 @@ function router(Database $dbForConsole, SwooleRequest $swooleRequest, Response $ \curl_close($ch); if ($errNo !== 0) { - $response->setStatusCode(500)->send("Internal error: " . $error); - return true; + throw new AppwriteException(AppwriteException::GENERAL_ARGUMENT_INVALID, "Internal error: " . $error); } if ($statusCode >= 400) { $error = \json_decode($executionResponse, true)['message']; - $response->setStatusCode(500)->send("Execution error: " . $error); - return true; + throw new AppwriteException(AppwriteException::GENERAL_ARGUMENT_INVALID, "Execution error: " . $error); } $execution = \json_decode($executionResponse, true); @@ -173,7 +173,7 @@ App::init() $mainDomain = App::getEnv('_APP_DOMAIN', ''); // Only run Router when external domain if ($host !== $mainDomain && $host !== 'localhost') { - if (router($dbForConsole, $swooleRequest, $response)) { + if (router($utopia, $dbForConsole, $swooleRequest, $response)) { return; } } @@ -451,11 +451,12 @@ App::init() }); App::options() + ->inject('utopia') ->inject('swooleRequest') ->inject('request') ->inject('response') ->inject('dbForConsole') - ->action(function (SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole) { + ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole) { /* * Appwrite Router */ @@ -463,7 +464,7 @@ App::options() $mainDomain = App::getEnv('_APP_DOMAIN', ''); // Only run Router when external domain if ($host !== $mainDomain && $host !== 'localhost') { - if (router($dbForConsole, $swooleRequest, $response)) { + if (router($utopia, $dbForConsole, $swooleRequest, $response)) { return; } } @@ -493,6 +494,8 @@ App::error() $version = App::getEnv('_APP_VERSION', 'UNKNOWN'); $route = $utopia->getRoute(); + \var_dump($route->getPath()); + if ($logger) { if ($error->getCode() >= 500 || $error->getCode() === 0) { try { diff --git a/app/workers/builds.php b/app/workers/builds.php index 0d2395c0ee..d9e185674e 100644 --- a/app/workers/builds.php +++ b/app/workers/builds.php @@ -558,7 +558,6 @@ class BuildsV1 extends Worker } catch (\Exception $e) { $error = $e; } finally { - $dbForConsole->deleteDocument('vcsCommentLocks', $commentId); }