From 536f953f1df2e5e92b7e6ebb31d385cf9ebbef22 Mon Sep 17 00:00:00 2001
From: kodumbeats <brandon.leckemby@gmail.com>
Date: Thu, 1 Jul 2021 13:48:37 -0400
Subject: [PATCH] Retrieve cache and db without registry

---
 app/init.php | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/init.php b/app/init.php
index c01c9dddfe..e3aede7ca3 100644
--- a/app/init.php
+++ b/app/init.php
@@ -600,32 +600,26 @@ App::setResource('projectDB', function($db, $cache, $project) {
     return $projectDB;
 }, ['db', 'cache', 'project']);
 
-App::setResource('dbForInternal', function($register, $project) {
-    $cache = new Cache(new RedisCache($register->get('cache')));
+App::setResource('dbForInternal', function($db, $cache, $project) {
+    $dbForInternal = new Database2(new MariaDB($db), $cache);
+    $dbForInternal->setNamespace('project_'.$project->getId().'_internal');
 
-    $database = new Database2(new MariaDB($register->get('db')), $cache);
-    $database->setNamespace('project_'.$project->getId().'_internal');
+    return $dbForInternal;
+}, ['db', 'cache', 'project']);
 
-    return $database;
-}, ['register', 'project']);
+App::setResource('dbForExternal', function($db, $cache, $project) {
+    $dbForExternal = new Database2(new MariaDB($db), $cache);
+    $dbForExternal->setNamespace('project_'.$project->getId().'_external');
 
-App::setResource('dbForExternal', function($register, $project) {
-    $cache = new Cache(new RedisCache($register->get('cache')));
+    return $dbForExternal;
+}, ['db', 'cache', 'project']);
 
-    $database = new Database2(new MariaDB($register->get('db')), $cache);
-    $database->setNamespace('project_'.$project->getId().'_external');
+App::setResource('dbForConsole', function($db, $cache) {
+    $dbForConsole = new Database2(new MariaDB($db), $cache);
+    $dbForConsole->setNamespace('project_console_internal');
 
-    return $database;
-}, ['register', 'project']);
-
-App::setResource('dbForConsole', function($register) {
-    $cache = new Cache(new RedisCache($register->get('cache')));
-
-    $database = new Database2(new MariaDB($register->get('db')), $cache);
-    $database->setNamespace('project_console_internal');
-
-    return $database;
-}, ['register']);
+    return $dbForConsole;
+}, ['db', 'cache']);
 
 App::setResource('mode', function($request) {
     /** @var Utopia\Swoole\Request $request */