CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 01:37:56 +13:00
Code Issues Projects Releases Wiki Activity

Fixed linter errors

Browse source
This commit is contained in:
Eldad Fux 2022-10-19 11:35:30 +03:00
parent 4fe5c0dd1d
commit d51c379514
7 changed files with 80 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/cli.php
View file

@ -103,7 +103,7 @@ $cli
$cli
->error(function ($error) {
if(App::getEnv('_APP_ENV', 'development')) {
if (App::getEnv('_APP_ENV', 'development')) {
Console::error($error);
} else {
Console::error($error->getMessage());

32
app/controllers/api/health.php
View file

@ -77,22 +77,22 @@ App::get('/v1/health/db')
$checkStart = \microtime(true);
if($adapter->ping()) {
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'pass',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
} else {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
}
} catch (\Throwable $th) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
@ -134,22 +134,22 @@ App::get('/v1/health/cache')
$checkStart = \microtime(true);
if($adapter->ping()) {
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'pass',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
} else {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
}
} catch (\Throwable $th) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
@ -191,22 +191,22 @@ App::get('/v1/health/queue')
$checkStart = \microtime(true);
if($adapter->ping()) {
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'pass',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
} else {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
}
} catch (\Throwable $th) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
@ -248,22 +248,22 @@ App::get('/v1/health/pubsub')
$checkStart = \microtime(true);
if($adapter->ping()) {
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'pass',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
} else {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);
}
} catch (\Throwable $th) {
$output[] = new Document([
'name' => $key." ($database)",
'name' => $key . " ($database)",
'status' => 'fail',
'ping' => \round((\microtime(true) - $checkStart) / 1000)
]);

22
app/init.php
View file

@ -499,7 +499,7 @@ $register->set('logger', function () {
});
$register->set('pools', function () {
$group= new Group();
$group = new Group();
$fallbackForDB = URLURL::unparse([
'scheme' => 'mariadb',
@ -559,11 +559,11 @@ $register->set('pools', function () {
foreach ($dsns as &$dsn) {
$dsn = explode('=', $dsn);
$name = ($multipe) ? $key.'_'.$dsn[0] : $key;
$name = ($multipe) ? $key . '_' . $dsn[0] : $key;
$dsn = $dsn[1] ?? '';
$config[] = $name;
if(empty($dsn)) {
if (empty($dsn)) {
//throw new Exception(Exception::GENERAL_SERVER_ERROR, "Missing value for DSN connection in {$key}");
continue;
}
@ -575,7 +575,7 @@ $register->set('pools', function () {
$dsnPass = $dsn->getPassword();
$dsnScheme = $dsn->getDatabase();
if(!in_array($dsn->getScheme(), $schemes)) {
if (!in_array($dsn->getScheme(), $schemes)) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
}
@ -591,7 +591,7 @@ $register->set('pools', function () {
case 'mysql':
case 'mariadb':
$resource = function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnScheme) {
return new PDOProxy(function() use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnScheme) {
return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnScheme) {
return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnScheme};charset=utf8mb4", $dsnUser, $dsnPass, array(
PDO::ATTR_TIMEOUT => 3, // Seconds
PDO::ATTR_PERSISTENT => true,
@ -604,10 +604,10 @@ $register->set('pools', function () {
};
break;
case 'redis':
$resource = function() use ($dsnHost, $dsnPort, $dsnPass) {
$resource = function () use ($dsnHost, $dsnPort, $dsnPass) {
$redis = new Redis();
@$redis->pconnect($dsnHost, (int)$dsnPort);
if($dsnPass) {
if ($dsnPass) {
$redis->auth($dsnPass);
}
$redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
@ -658,13 +658,13 @@ $register->set('pools', function () {
$group->add($pool);
}
Config::setParam('pools-'.$key, $config);
Config::setParam('pools-' . $key, $config);
}
try {
$group->fill();
} catch (\Throwable $th) {
Console::error('Connection failure: '.$th->getMessage());
Console::error('Connection failure: ' . $th->getMessage());
}
return $group;
@ -1022,7 +1022,7 @@ App::setResource('console', function () {
}, []);
App::setResource('dbForProject', function (Group $pools, Database $dbForConsole, Cache $cache, Document $project) {
if($project->isEmpty() || $project->getId() === 'console') {
if ($project->isEmpty() || $project->getId() === 'console') {
return $dbForConsole;
}
@ -1033,7 +1033,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
;
$database = new Database($dbAdapter, $cache);
$database->setNamespace('_'.$project->getInternalId());
$database->setNamespace('_' . $project->getInternalId());
$database->setDefaultDatabase('appwrite');
return $database;

4
app/realtime.php
View file

@ -59,7 +59,7 @@ function getProjectDB(Document $project): Database
$pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
if($project->isEmpty() || $project->getId() === 'console') {
if ($project->isEmpty() || $project->getId() === 'console') {
return getConsoleDB();
}
@ -70,7 +70,7 @@ function getProjectDB(Document $project): Database
;
$database = new Database($dbAdapter, getCache());
$database->setNamespace('_'.$project->getInternalId());
$database->setNamespace('_' . $project->getInternalId());
$database->setDefaultDatabase('appwrite');
return $database;

34
app/tasks/doctor.php
View file

@ -107,13 +107,13 @@ $cli
try {
$adapter = $pools->get($database)->pop()->getResource();
if($adapter->ping()) {
Console::success('🟢 '.str_pad("{$key}({$database})", 50, '.').'connected');
if ($adapter->ping()) {
Console::success('🟢 ' . str_pad("{$key}({$database})", 50, '.') . 'connected');
} else {
Console::error('🔴 '.str_pad("{$key}({$database})", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("{$key}({$database})", 47, '.') . 'disconnected');
}
} catch (\Throwable $th) {
Console::error('🔴 '.str_pad("{$key}.({$database})", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("{$key}.({$database})", 47, '.') . 'disconnected');
}
}
}
@ -130,13 +130,13 @@ $cli
try {
$adapter = $pools->get($pool)->pop()->getResource();
if($adapter->ping()) {
Console::success('🟢 '.str_pad("{$key}({$pool})", 50, '.').'connected');
if ($adapter->ping()) {
Console::success('🟢 ' . str_pad("{$key}({$pool})", 50, '.') . 'connected');
} else {
Console::error('🔴 '.str_pad("{$key}({$pool})", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("{$key}({$pool})", 47, '.') . 'disconnected');
}
} catch (\Throwable $th) {
Console::error('🔴 '.str_pad("{$key}({$pool})", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("{$key}({$pool})", 47, '.') . 'disconnected');
}
}
}
@ -149,12 +149,12 @@ $cli
);
if ((@$antivirus->ping())) {
Console::success('🟢 '.str_pad("Antivirus", 50, '.').'connected');
Console::success('🟢 ' . str_pad("Antivirus", 50, '.') . 'connected');
} else {
Console::error('🔴 '.str_pad("Antivirus", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("Antivirus", 47, '.') . 'disconnected');
}
} catch (\Throwable $th) {
Console::error('🔴 '.str_pad("Antivirus", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("Antivirus", 47, '.') . 'disconnected');
}
}
@ -167,29 +167,29 @@ $cli
$mail->AltBody = 'Hello World';
$mail->send();
Console::success('🟢 '.str_pad("SMTP", 50, '.').'connected');
Console::success('🟢 ' . str_pad("SMTP", 50, '.') . 'connected');
} catch (\Throwable $th) {
Console::error('🔴 '.str_pad("SMTP", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("SMTP", 47, '.') . 'disconnected');
}
$host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
$port = App::getEnv('_APP_STATSD_PORT', 8125);
if ($fp = @\fsockopen('udp://' . $host, $port, $errCode, $errStr, 2)) {
Console::success('🟢 '.str_pad("StatsD", 50, '.').'connected');
Console::success('🟢 ' . str_pad("StatsD", 50, '.') . 'connected');
\fclose($fp);
} else {
Console::error('🔴 '.str_pad("StatsD", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("StatsD", 47, '.') . 'disconnected');
}
$host = App::getEnv('_APP_INFLUXDB_HOST', '');
$port = App::getEnv('_APP_INFLUXDB_PORT', '');
if ($fp = @\fsockopen($host, $port, $errCode, $errStr, 2)) {
Console::success('🟢 '.str_pad("InfluxDB", 50, '.').'connected');
Console::success('🟢 ' . str_pad("InfluxDB", 50, '.') . 'connected');
\fclose($fp);
} else {
Console::error('🔴 '.str_pad("InfluxDB", 47, '.').'disconnected');
Console::error('🔴 ' . str_pad("InfluxDB", 47, '.') . 'disconnected');
}
\sleep(0.2);

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

@ -143,7 +143,6 @@ abstract class Worker
$pools->reclaim();
$this->shutdown();
} catch (\Throwable $error) {
foreach (self::$errorCallbacks as $errorCallback) {
$errorCallback($error, "shutdown", $this->getName());
@ -176,7 +175,7 @@ abstract class Worker
$pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
if($project->isEmpty() || $project->getId() === 'console') {
if ($project->isEmpty() || $project->getId() === 'console') {
return $this->getConsoleDB();
}
@ -187,7 +186,7 @@ abstract class Worker
;
$database = new Database($dbAdapter, $this->getCache());
$database->setNamespace('_'.$project->getInternalId());
$database->setNamespace('_' . $project->getInternalId());
$database->setDefaultDatabase('appwrite');
return $database;