diff --git a/app/cli.php b/app/cli.php index c8ebd089b1..ace64e5e9d 100644 --- a/app/cli.php +++ b/app/cli.php @@ -58,7 +58,11 @@ CLI::setResource('dbForConsole', function ($pools, $cache) { ->getResource(); $dbForConsole = new Database($dbAdapter, $cache); - $dbForConsole->setNamespace('_console'); + + $dbForConsole + ->setNamespace('_console') + ->setMetadata('host', \gethostname()) + ->setMetadata('project', 'console'); // Ensure tables exist $collections = Config::getParam('collections', [])['console']; @@ -108,7 +112,10 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $databases[$databaseName] = $database; - $database->setNamespace('_' . $project->getInternalId()); + $database + ->setNamespace('_' . $project->getInternalId()) + ->setMetadata('host', \gethostname()) + ->setMetadata('project', $project->getId()); return $database; }; diff --git a/app/init.php b/app/init.php index c32c63f1f2..69a70d4c5e 100644 --- a/app/init.php +++ b/app/init.php @@ -1032,6 +1032,9 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons } } + $dbForProject->setMetadata('user', $user->getId()); + $dbForConsole->setMetadata('user', $user->getId()); + return $user; }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForConsole']); @@ -1103,7 +1106,11 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole, ; $database = new Database($dbAdapter, $cache); - $database->setNamespace('_' . $project->getInternalId()); + + $database + ->setNamespace('_' . $project->getInternalId()) + ->setMetadata('host', \gethostname()) + ->setMetadata('project', $project->getId()); return $database; }, ['pools', 'dbForConsole', 'cache', 'project']); @@ -1117,7 +1124,10 @@ App::setResource('dbForConsole', function (Group $pools, Cache $cache) { $database = new Database($dbAdapter, $cache); - $database->setNamespace('_console'); + $database + ->setNamespace('_console') + ->setMetadata('host', \gethostname()) + ->setMetadata('project', 'console'); return $database; }, ['pools', 'cache']); @@ -1147,7 +1157,10 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $databases[$databaseName] = $database; - $database->setNamespace('_' . $project->getInternalId()); + $database + ->setNamespace('_' . $project->getInternalId()) + ->setMetadata('host', \gethostname()) + ->setMetadata('project', $project->getId()); return $database; }; diff --git a/app/realtime.php b/app/realtime.php index 25b0532b42..97120bf2f8 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -47,7 +47,10 @@ function getConsoleDB(): Database $database = new Database($dbAdapter, getCache()); - $database->setNamespace('_console'); + $database + ->setNamespace('_console') + ->setMetadata('host', \gethostname()) + ->setMetadata('project', $project->getId()); return $database; } @@ -70,7 +73,11 @@ function getProjectDB(Document $project): Database ; $database = new Database($dbAdapter, getCache()); - $database->setNamespace('_' . $project->getInternalId()); + + $database + ->setNamespace('_' . $project->getInternalId()) + ->setMetadata('host', \gethostname()) + ->setMetadata('project', $project->getId()); return $database; }