Merge pull request #3116 from appwrite/fix-remove-usage-queue
fix: remove usage queue
This commit is contained in:
commit
a6c27a3876
5 changed files with 0 additions and 65 deletions
|
@ -214,24 +214,6 @@ App::get('/v1/health/queue/logs')
|
||||||
$response->dynamic(new Document([ 'size' => Resque::size(Event::AUDITS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
|
$response->dynamic(new Document([ 'size' => Resque::size(Event::AUDITS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
|
||||||
}, ['response']);
|
}, ['response']);
|
||||||
|
|
||||||
App::get('/v1/health/queue/usage')
|
|
||||||
->desc('Get Usage Queue')
|
|
||||||
->groups(['api', 'health'])
|
|
||||||
->label('scope', 'health.read')
|
|
||||||
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
|
|
||||||
->label('sdk.namespace', 'health')
|
|
||||||
->label('sdk.method', 'getQueueUsage')
|
|
||||||
->label('sdk.description', '/docs/references/health/get-queue-usage.md')
|
|
||||||
->label('sdk.response.code', Response::STATUS_CODE_OK)
|
|
||||||
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
|
|
||||||
->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
|
|
||||||
->inject('response')
|
|
||||||
->action(function ($response) {
|
|
||||||
/** @var Appwrite\Utopia\Response $response */
|
|
||||||
|
|
||||||
$response->dynamic(new Document([ 'size' => Resque::size(Event::USAGE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
|
|
||||||
}, ['response']);
|
|
||||||
|
|
||||||
App::get('/v1/health/queue/certificates')
|
App::get('/v1/health/queue/certificates')
|
||||||
->desc('Get Certificates Queue')
|
->desc('Get Certificates Queue')
|
||||||
->groups(['api', 'health'])
|
->groups(['api', 'health'])
|
||||||
|
|
|
@ -163,28 +163,6 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
|
||||||
* Save current connections to the Database every 5 seconds.
|
* Save current connections to the Database every 5 seconds.
|
||||||
*/
|
*/
|
||||||
Timer::tick(5000, function () use ($register, $stats, &$statsDocument, $logError) {
|
Timer::tick(5000, function () use ($register, $stats, &$statsDocument, $logError) {
|
||||||
/** @var Document $statsDocument */
|
|
||||||
foreach ($stats as $projectId => $value) {
|
|
||||||
$connections = $stats->get($projectId, 'connections') ?? 0;
|
|
||||||
$messages = $stats->get($projectId, 'messages' ?? 0);
|
|
||||||
|
|
||||||
$usage = new Event('v1-usage', 'UsageV1');
|
|
||||||
$usage
|
|
||||||
->setParam('projectId', $projectId)
|
|
||||||
->setParam('realtimeConnections', $connections)
|
|
||||||
->setParam('realtimeMessages', $messages)
|
|
||||||
->setParam('networkRequestSize', 0)
|
|
||||||
->setParam('networkResponseSize', 0);
|
|
||||||
|
|
||||||
$stats->set($projectId, [
|
|
||||||
'messages' => 0,
|
|
||||||
'connections' => 0
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
|
|
||||||
$usage->trigger();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$payload = [];
|
$payload = [];
|
||||||
foreach ($stats as $projectId => $value) {
|
foreach ($stats as $projectId => $value) {
|
||||||
$payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
|
$payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Get the number of usage stats that are waiting to be processed in the Appwrite internal queue server.
|
|
|
@ -16,9 +16,6 @@ class Event
|
||||||
const AUDITS_QUEUE_NAME = 'v1-audits';
|
const AUDITS_QUEUE_NAME = 'v1-audits';
|
||||||
const AUDITS_CLASS_NAME = 'AuditsV1';
|
const AUDITS_CLASS_NAME = 'AuditsV1';
|
||||||
|
|
||||||
const USAGE_QUEUE_NAME = 'v1-usage';
|
|
||||||
const USAGE_CLASS_NAME = 'UsageV1';
|
|
||||||
|
|
||||||
const MAILS_QUEUE_NAME = 'v1-mails';
|
const MAILS_QUEUE_NAME = 'v1-mails';
|
||||||
const MAILS_CLASS_NAME = 'MailsV1';
|
const MAILS_CLASS_NAME = 'MailsV1';
|
||||||
|
|
||||||
|
|
|
@ -146,27 +146,6 @@ class HealthCustomServerTest extends Scope
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUsageSuccess(): array
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Test for SUCCESS
|
|
||||||
*/
|
|
||||||
$response = $this->client->call(Client::METHOD_GET, '/health/queue/usage', array_merge([
|
|
||||||
'content-type' => 'application/json',
|
|
||||||
'x-appwrite-project' => $this->getProject()['$id'],
|
|
||||||
], $this->getHeaders()), []);
|
|
||||||
|
|
||||||
$this->assertEquals(200, $response['headers']['status-code']);
|
|
||||||
$this->assertIsInt($response['body']['size']);
|
|
||||||
$this->assertLessThan(200, $response['body']['size']);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test for FAILURE
|
|
||||||
*/
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testCertificatesSuccess(): array
|
public function testCertificatesSuccess(): array
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue