CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-13 00:04:47 +12:00
Code Issues Projects Releases Wiki Activity

Added cache, updated db names

Browse source
This commit is contained in:
Eldad Fux 2021-05-03 22:22:39 +03:00
parent eab18af07e
commit aa119d50d5
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/projects.php
View file

@ -94,9 +94,9 @@ App::post('/v1/projects')
$collections = Config::getParam('collections2', []); /** @var array $collections */
$dbForInternal->setNamespace('project_internal_'.$project->getId());
$dbForInternal->setNamespace('project_'.$project->getId().'_internal');
$dbForInternal->create();
$dbForExternal->setNamespace('project_external_'.$project->getId());
$dbForExternal->setNamespace('project_'.$project->getId().'_external');
$dbForExternal->create();
foreach ($collections as $key => $collection) {

9
app/init.php
View file

@ -30,7 +30,7 @@ use Utopia\Registry\Registry;
use MaxMind\Db\Reader;
use PHPMailer\PHPMailer\PHPMailer;
use PDO as PDONative;
use Utopia\Cache\Adapter\None;
use Utopia\Cache\Adapter\Redis as RedisCache;
use Utopia\Cache\Cache;
use Utopia\Database\Adapter\MariaDB;
use Utopia\Database\Database as DatabaseDatabase;
@ -510,19 +510,20 @@ App::setResource('projectDB', function($register, $project) {
}, ['register', 'project']);
App::setResource('dbForInternal', function($register, $project) {
$cache = new Cache(new None());
$cache = new Cache(new RedisCache($register->get('cache')));
$database = new DatabaseDatabase(new MariaDB($register->get('db')), $cache);
$database->setNamespace('project_internal_'.$project->getId());
$database->setNamespace('project_'.$project->getId().'_internal');
return $database;
}, ['register', 'project']);
App::setResource('dbForExternal', function($register, $project) {
$cache = new Cache(new None());
$cache = new Cache(new RedisCache($register->get('cache')));
$database = new DatabaseDatabase(new MariaDB($register->get('db')), $cache);
$database->setNamespace('project_external_'.$project->getId());
$database->setNamespace('project_'.$project->getId().'_external');
return $database;
}, ['register', 'project']);

4
app/views/console/storage/index.phtml
View file

@ -106,11 +106,11 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
<input type="hidden" data-ls-attrs="id=file-folderId-{{file.$id}}" name="folderId" data-cast-to="integer" value="1">
<label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
<input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.read}}" placeholder="User ID, Team ID or Role" />
<input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$read}}" placeholder="User ID, Team ID or Role" />
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
<label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
<input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.write}}" placeholder="User ID, Team ID or Role" />
<input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$write}}" placeholder="User ID, Team ID or Role" />
<div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
</form>

4
composer.lock generated
View file

@ -1923,7 +1923,7 @@
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database",
"reference": "81a16f851c712f5857c044c0e71c0abc698cd619"
"reference": "43744d220c41048d677643c70a0aa3ab90652e13"
},
"require": {
"ext-mongodb": "*",
@ -1970,7 +1970,7 @@
"upf",
"utopia"
],
"time": "2021-05-03T09:59:14+00:00"
"time": "2021-05-03T11:07:15+00:00"
},
{
"name": "utopia-php/domains",