Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'remove-globals' of github.com:appwrite/appwrite into swoole

Browse source
This commit is contained in:
Eldad Fux 2020-06-29 11:58:23 +03:00
commit 39c43110fe
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/app.php
View file

@ -381,7 +381,6 @@ App::options(function () use ($request, $response) {
});
App::error(function ($error /* @var $error Exception */) use ($request, $response, $utopia, $project) {
$env = Config::getParam('env');
$version = Config::getParam('version');
switch ($error->getCode()) {
@ -403,7 +402,7 @@ App::error(function ($error /* @var $error Exception */) use ($request, $respons
$_SERVER = []; // Reset before reporting to error log to avoid keys being compromised
$output = ($utopia->isDevelopment()) ? [
$output = ((App::isDevelopment())) ? [
'message' => $error->getMessage(),
'code' => $error->getCode(),
'file' => $error->getFile(),

36
app/server.php
View file

@ -17,7 +17,7 @@ ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
$http = new Server("localhost", 9501);
echo 'test';
$http
->set([
'open_http2_protocol' => true,
@ -41,7 +41,7 @@ $http->on('AfterReload', function($serv, $workerId) {
$http->on('start', function (Server $http) {
Console::success('Server started succefully');
printf("master pid %d, manager pid %d\n", $http->master_pid, $http->manager_pid);
printf("x master pid %d, manager pid %d\n", $http->master_pid, $http->manager_pid);
// listen ctrl + c
Process::signal(2, function () use ($http) {
@ -50,24 +50,26 @@ $http->on('start', function (Server $http) {
});
});
$register = new Registry();
$utopia = new App('Asia/Tel_Aviv');
/**
* @var $request Request
*/
$request &= null;
$response &= null;
// $register = new Registry();
// $utopia = new App('Asia/Tel_Aviv');
// /**
// * @var $request Request
// */
// $request &= null;
// $response &= null;
include 'init.php';
include 'app.php';
// include 'init.php';
// include 'app.php';
$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) {
global $request, $response, $utopia;
$request = new Request($swooleRequest);
$response = new Response($swooleResponse);
$counter = 0;
$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use (&$counter) {
// global $request, $response, $utopia;
// $request = new Request($swooleRequest);
// $response = new Response($swooleResponse);
$swooleResponse->end('test: '.$counter++);
try {
$utopia->run($request, $response);
//$utopia->run($request, $response);
} catch (\Throwable $th) {
var_dump($th->getMessage());
var_dump($th->getFile());