From 70afd1efeddccedbf6c3abfc1c8578aa1b8ea8bc Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 24 Oct 2022 01:34:12 +0000
Subject: [PATCH] pool reclaim

---
 app/cli.php         | 38 ++++++++++----------------------------
 app/tasks/usage.php |  3 ++-
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 94830490af..23cea75306 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -47,20 +47,11 @@ function getConsoleDB(): Database
 
     $pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
 
-    try {
-        $dbAdapter = $pools
-            ->get('console')
-            ->pop()
-            ->getResource()
-        ;
-    } catch (Throwable $error) {
-        $pools->fill();
-        $dbAdapter = $pools
-            ->get('console')
-            ->pop()
-            ->getResource()
-        ;
-    }
+    $dbAdapter = $pools
+        ->get('console')
+        ->pop()
+        ->getResource()
+    ;
 
     $database = new Database($dbAdapter, getCache());
 
@@ -80,20 +71,11 @@ function getProjectDB(Document $project): Database
         return getConsoleDB();
     }
 
-    try {
-        $dbAdapter = $pools
-            ->get($project->getAttribute('database'))
-            ->pop()
-            ->getResource()
-        ;
-    } catch (Throwable $error) {
-        $pools->fill();
-        $dbAdapter = $pools
-            ->get($project->getAttribute('database'))
-            ->pop()
-            ->getResource()
-        ;
-    }
+    $dbAdapter = $pools
+        ->get($project->getAttribute('database'))
+        ->pop()
+        ->getResource()
+    ;
 
     $database = new Database($dbAdapter, getCache());
     $database->setNamespace('_' . $project->getInternalId());
diff --git a/app/tasks/usage.php b/app/tasks/usage.php
index 7068a6a86c..049041bdc8 100644
--- a/app/tasks/usage.php
+++ b/app/tasks/usage.php
@@ -92,7 +92,7 @@ $cli
     ->task('usage')
     ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
     ->desc('Schedules syncing data from influxdb to Appwrite console db')
-    ->action(function (string $type) use ($logError) {
+    ->action(function (string $type) use ($logError, $register) {
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');
 
@@ -110,4 +110,5 @@ $cli
             default:
                 Console::error("Unsupported usage aggregation type");
         }
+        $register->get('pools')->reclaim();
     });