Revert debugs
This commit is contained in:
parent
b857fa3cdc
commit
8a73203635
8 changed files with 110 additions and 77 deletions
28
app/cli.php
28
app/cli.php
|
@ -104,17 +104,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
|
||||||
if (isset($databases[$databaseName])) {
|
if (isset($databases[$databaseName])) {
|
||||||
$database = $databases[$databaseName];
|
$database = $databases[$databaseName];
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
return $database;
|
return $database;
|
||||||
}
|
}
|
||||||
|
@ -128,17 +128,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
|
||||||
|
|
||||||
$databases[$databaseName] = $database;
|
$databases[$databaseName] = $database;
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
$database
|
$database
|
||||||
->setMetadata('host', \gethostname())
|
->setMetadata('host', \gethostname())
|
||||||
|
|
|
@ -130,7 +130,7 @@ App::post('/v1/projects')
|
||||||
}
|
}
|
||||||
|
|
||||||
$databaseOverride = App::getEnv('_APP_DATABASE_OVERRIDE');
|
$databaseOverride = App::getEnv('_APP_DATABASE_OVERRIDE');
|
||||||
$index = array_search($databaseOverride, $databases);
|
$index = \array_search($databaseOverride, $databases);
|
||||||
if ($index !== false) {
|
if ($index !== false) {
|
||||||
$database = $databases[$index];
|
$database = $databases[$index];
|
||||||
} else {
|
} else {
|
||||||
|
@ -199,17 +199,17 @@ App::post('/v1/projects')
|
||||||
|
|
||||||
$dbForProject = new Database($pools->get($database)->pop()->getResource(), $cache);
|
$dbForProject = new Database($pools->get($database)->pop()->getResource(), $cache);
|
||||||
|
|
||||||
// if ($database === DATABASE_SHARED_TABLES) {
|
if ($database === DATABASE_SHARED_TABLES) {
|
||||||
$dbForProject
|
$dbForProject
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $dbForProject
|
$dbForProject
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
$dbForProject->create();
|
$dbForProject->create();
|
||||||
|
|
||||||
|
|
36
app/init.php
36
app/init.php
|
@ -1135,19 +1135,19 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
|
||||||
->setMetadata('project', $project->getId())
|
->setMetadata('project', $project->getId())
|
||||||
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
|
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
|
||||||
|
|
||||||
//if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
return null;
|
|
||||||
// return $database;
|
return $database;
|
||||||
}, ['pools', 'dbForConsole', 'cache', 'project']);
|
}, ['pools', 'dbForConsole', 'cache', 'project']);
|
||||||
|
|
||||||
App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
|
App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
|
||||||
|
@ -1183,17 +1183,17 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
|
||||||
->setMetadata('project', $project->getId())
|
->setMetadata('project', $project->getId())
|
||||||
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
|
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isset($databases[$databaseName])) {
|
if (isset($databases[$databaseName])) {
|
||||||
|
@ -1210,8 +1210,8 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
|
||||||
$database = new Database($dbAdapter, $cache);
|
$database = new Database($dbAdapter, $cache);
|
||||||
$databases[$databaseName] = $database;
|
$databases[$databaseName] = $database;
|
||||||
$configure($database);
|
$configure($database);
|
||||||
return null;
|
|
||||||
// return $database;
|
return $database;
|
||||||
};
|
};
|
||||||
}, ['pools', 'dbForConsole', 'cache']);
|
}, ['pools', 'dbForConsole', 'cache']);
|
||||||
|
|
||||||
|
|
|
@ -78,17 +78,17 @@ function getProjectDB(Document $project): Database
|
||||||
|
|
||||||
$database = new Database($dbAdapter, getCache());
|
$database = new Database($dbAdapter, getCache());
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
return $database;
|
return $database;
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,17 +75,17 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
|
||||||
->setMetadata('host', \gethostname())
|
->setMetadata('host', \gethostname())
|
||||||
->setMetadata('project', $project->getId());
|
->setMetadata('project', $project->getId());
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
return $database;
|
return $database;
|
||||||
}, ['cache', 'register', 'message', 'dbForConsole']);
|
}, ['cache', 'register', 'message', 'dbForConsole']);
|
||||||
|
@ -114,17 +114,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
|
||||||
if (isset($databases[$databaseName])) {
|
if (isset($databases[$databaseName])) {
|
||||||
$database = $databases[$databaseName];
|
$database = $databases[$databaseName];
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
return $database;
|
return $database;
|
||||||
}
|
}
|
||||||
|
@ -138,17 +138,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
|
||||||
|
|
||||||
$databases[$databaseName] = $database;
|
$databases[$databaseName] = $database;
|
||||||
|
|
||||||
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
|
||||||
$database
|
$database
|
||||||
->setShareTables(true)
|
->setShareTables(true)
|
||||||
->setTenant($project->getInternalId())
|
->setTenant($project->getInternalId())
|
||||||
->setNamespace('');
|
->setNamespace('');
|
||||||
// } else {
|
} else {
|
||||||
// $database
|
$database
|
||||||
// ->setShareTables(false)
|
->setShareTables(false)
|
||||||
// ->setTenant(null)
|
->setTenant(null)
|
||||||
// ->setNamespace('_' . $project->getInternalId());
|
->setNamespace('_' . $project->getInternalId());
|
||||||
// }
|
}
|
||||||
|
|
||||||
return $database;
|
return $database;
|
||||||
};
|
};
|
||||||
|
|
|
@ -83,15 +83,26 @@ class DeleteOrphanedProjects extends Action
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$db = $project->getAttribute('database');
|
$database = $project->getAttribute('database');
|
||||||
$adapter = $pools
|
$adapter = $pools
|
||||||
->get($db)
|
->get($database)
|
||||||
->pop()
|
->pop()
|
||||||
->getResource();
|
->getResource();
|
||||||
|
|
||||||
$dbForProject = new Database($adapter, $cache);
|
$dbForProject = new Database($adapter, $cache);
|
||||||
$dbForProject->setDatabase('appwrite');
|
$dbForProject->setDatabase('appwrite');
|
||||||
$dbForProject->setNamespace('_' . $project->getInternalId());
|
|
||||||
|
if ($database === DATABASE_SHARED_TABLES) {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(true)
|
||||||
|
->setTenant($project->getInternalId())
|
||||||
|
->setNamespace('');
|
||||||
|
} else {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(false)
|
||||||
|
->setTenant(null)
|
||||||
|
->setNamespace('_' . $project->getInternalId());
|
||||||
|
}
|
||||||
|
|
||||||
$collectionsCreated = 0;
|
$collectionsCreated = 0;
|
||||||
$cnt++;
|
$cnt++;
|
||||||
|
|
|
@ -95,15 +95,26 @@ class GetMigrationStats extends Action
|
||||||
Console::info("Getting stats for {$project->getId()}");
|
Console::info("Getting stats for {$project->getId()}");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$db = $project->getAttribute('database');
|
$database = $project->getAttribute('database');
|
||||||
$adapter = $pools
|
$adapter = $pools
|
||||||
->get($db)
|
->get($database)
|
||||||
->pop()
|
->pop()
|
||||||
->getResource();
|
->getResource();
|
||||||
|
|
||||||
$dbForProject = new Database($adapter, $cache);
|
$dbForProject = new Database($adapter, $cache);
|
||||||
$dbForProject->setDatabase('appwrite');
|
$dbForProject->setDatabase('appwrite');
|
||||||
$dbForProject->setNamespace('_' . $project->getInternalId());
|
|
||||||
|
if ($database === DATABASE_SHARED_TABLES) {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(true)
|
||||||
|
->setTenant($project->getInternalId())
|
||||||
|
->setNamespace('');
|
||||||
|
} else {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(false)
|
||||||
|
->setTenant(null)
|
||||||
|
->setNamespace('_' . $project->getInternalId());
|
||||||
|
}
|
||||||
|
|
||||||
/** Get Project ID */
|
/** Get Project ID */
|
||||||
$stats['Project ID'] = $project->getId();
|
$stats['Project ID'] = $project->getId();
|
||||||
|
|
|
@ -115,15 +115,26 @@ class Hamster extends Action
|
||||||
Console::log("Getting stats for Project {$project->getId()}");
|
Console::log("Getting stats for Project {$project->getId()}");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$db = $project->getAttribute('database');
|
$database = $project->getAttribute('database');
|
||||||
$adapter = $pools
|
$adapter = $pools
|
||||||
->get($db)
|
->get($database)
|
||||||
->pop()
|
->pop()
|
||||||
->getResource();
|
->getResource();
|
||||||
|
|
||||||
$dbForProject = new Database($adapter, $cache);
|
$dbForProject = new Database($adapter, $cache);
|
||||||
$dbForProject->setDatabase('appwrite');
|
$dbForProject->setDatabase('appwrite');
|
||||||
$dbForProject->setNamespace('_' . $project->getInternalId());
|
|
||||||
|
if ($database === DATABASE_SHARED_TABLES) {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(true)
|
||||||
|
->setTenant($project->getInternalId())
|
||||||
|
->setNamespace('');
|
||||||
|
} else {
|
||||||
|
$dbForProject
|
||||||
|
->setShareTables(false)
|
||||||
|
->setTenant(null)
|
||||||
|
->setNamespace('_' . $project->getInternalId());
|
||||||
|
}
|
||||||
|
|
||||||
$statsPerProject = [];
|
$statsPerProject = [];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue