lint
This commit is contained in:
parent
a22d98296c
commit
c996dbcdc9
2 changed files with 24 additions and 41 deletions
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
require_once __DIR__ . '/../init.php';
|
require_once __DIR__ . '/../init.php';
|
||||||
|
|
||||||
|
use Appwrite\Auth\Auth;
|
||||||
use Appwrite\Event\Certificate;
|
use Appwrite\Event\Certificate;
|
||||||
use Appwrite\Event\Event;
|
use Appwrite\Event\Event;
|
||||||
use Appwrite\Event\Usage;
|
use Appwrite\Event\Usage;
|
||||||
|
@ -646,7 +647,8 @@ App::error()
|
||||||
->inject('project')
|
->inject('project')
|
||||||
->inject('logger')
|
->inject('logger')
|
||||||
->inject('log')
|
->inject('log')
|
||||||
->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log) {
|
->inject('queueForUsage')
|
||||||
|
->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Usage $queueForUsage) {
|
||||||
$version = System::getEnv('_APP_VERSION', 'UNKNOWN');
|
$version = System::getEnv('_APP_VERSION', 'UNKNOWN');
|
||||||
$route = $utopia->getRoute();
|
$route = $utopia->getRoute();
|
||||||
$class = \get_class($error);
|
$class = \get_class($error);
|
||||||
|
@ -735,6 +737,26 @@ App::error()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($publish && $project->getId() !== 'console') {
|
||||||
|
if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
|
||||||
|
$fileSize = 0;
|
||||||
|
$file = $request->getFiles('file');
|
||||||
|
if (!empty($file)) {
|
||||||
|
$fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$queueForUsage
|
||||||
|
->addMetric(METRIC_NETWORK_REQUESTS, 1)
|
||||||
|
->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
|
||||||
|
->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
|
||||||
|
}
|
||||||
|
|
||||||
|
$queueForUsage
|
||||||
|
->setProject($project)
|
||||||
|
->trigger();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($logger && $publish) {
|
if ($logger && $publish) {
|
||||||
try {
|
try {
|
||||||
/** @var Utopia\Database\Document $user */
|
/** @var Utopia\Database\Document $user */
|
||||||
|
|
|
@ -739,42 +739,3 @@ App::init()
|
||||||
throw new Exception(Exception::GENERAL_USAGE_DISABLED);
|
throw new Exception(Exception::GENERAL_USAGE_DISABLED);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
App::error()
|
|
||||||
->inject('error')
|
|
||||||
->inject('request')
|
|
||||||
->inject('response')
|
|
||||||
->inject('project')
|
|
||||||
->inject('queueForUsage')
|
|
||||||
->action(function (Throwable $error, Request $request, Response $response, Document $project, Usage $queueForUsage) {
|
|
||||||
|
|
||||||
if ($error instanceof AppwriteException) {
|
|
||||||
$publish = $error->isPublishable();
|
|
||||||
} else {
|
|
||||||
$publish = $error->getCode() === 0 || $error->getCode() >= 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($error->getCode() >= 400 && $error->getCode() < 500) {
|
|
||||||
$publish = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($publish && $project->getId() !== 'console') {
|
|
||||||
if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
|
|
||||||
$fileSize = 0;
|
|
||||||
$file = $request->getFiles('file');
|
|
||||||
if (!empty($file)) {
|
|
||||||
$fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$queueForUsage
|
|
||||||
->addMetric(METRIC_NETWORK_REQUESTS, 1)
|
|
||||||
->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
|
|
||||||
->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
|
|
||||||
}
|
|
||||||
|
|
||||||
$queueForUsage
|
|
||||||
->setProject($project)
|
|
||||||
->trigger();
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
Loading…
Reference in a new issue