Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Adjusting health API to new pools

Browse Source
This commit is contained in:
Binyamin Yawitz
2024-06-06 20:52:51 -04:00
parent ba629e94ef
commit 757cf24d4d
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/health.php
+25 -17
View File
@@ -16,7 +16,6 @@ use Utopia\Http\Validator\Integer;
use Utopia\Http\Validator\Multiple;
use Utopia\Http\Validator\Text;
use Utopia\Http\Validator\WhiteList;
use Utopia\Pools\Group;
use Utopia\Queue\Client;
use Utopia\Queue\Connection;
use Utopia\Registry\Registry;
@@ -85,6 +84,8 @@ Http::get('/v1/health/db')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
$checkStart = \microtime(true);
try {
$pool = $pools['pools-'.$key.'-'.$database]['pool'];
@@ -99,7 +100,6 @@ Http::get('/v1/health/db')
};
$adapter->setDatabase($dsn->getPath());
$checkStart = \microtime(true);
if ($adapter->ping()) {
$output[] = new Document([
@@ -140,7 +140,7 @@ Http::get('/v1/health/cache')
->inject('response')
->inject('pools')
->inject('connections')
->action(function (Response $response, Group $pools, Connections $connections) {
->action(function (Response $response, array $pools, Connections $connections) {
$output = [];
@@ -150,12 +150,15 @@ Http::get('/v1/health/cache')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
$checkStart = \microtime(true);
try {
$connection = $pools->get($database)->pop();
$connections->add($connection);
$adapter = $connection->getResource();
$pool = $pools['pools-cache-' . $database]['pool'];
$dsn = $pools['pools-cache-' . $database]['dsn'];
$connection = $pool->get();
$connections->add($connection, $pool);
$adapter = new Connection\Redis($dsn->getHost(), $dsn->getPort());
$checkStart = \microtime(true);
if ($adapter->ping()) {
$output[] = new Document([
@@ -200,7 +203,7 @@ Http::get('/v1/health/queue')
->inject('response')
->inject('pools')
->inject('connections')
->action(function (Response $response, Group $pools, Connections $connections) {
->action(function (Response $response, array $pools, Connections $connections) {
$output = [];
@@ -209,14 +212,16 @@ Http::get('/v1/health/queue')
];
foreach ($configs as $key => $config) {
$checkStart = \microtime(true);
foreach ($config as $database) {
try {
$connection = $pools->get($database)->pop();
$connections->add($connection);
$adapter = $connection->getResource();
$checkStart = \microtime(true);
$pool = $pools['pools-queue-' . $database]['pool'];
$dsn = $pools['pools-queue-' . $database]['dsn'];
$connection = $pool->get();
$connections->add($connection, $pool);
$adapter = new Connection\Redis($dsn->getHost(), $dsn->getPort());
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key . " ($database)",
@@ -260,7 +265,7 @@ Http::get('/v1/health/pubsub')
->inject('response')
->inject('pools')
->inject('connections')
->action(function (Response $response, Group $pools, Connections $connections) {
->action(function (Response $response, array $pools, Connections $connections) {
$output = [];
@@ -271,9 +276,12 @@ Http::get('/v1/health/pubsub')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
try {
$connection = $pools->get($database)->pop();
$connections->add($connection);
$adapter = $connection->getResource();
$pool = $pools['pools-pubsub-' . $database]['pool'];
$dsn = $pools['pools-pubsub-' . $database]['dsn'];
$connection = $pool->get();
$connections->add($connection, $pool);
$adapter = new Connection\Redis($dsn->getHost(), $dsn->getPort());
$checkStart = \microtime(true);