From dd1b9a533819e663aa2bb93ab1639bb3f1078407 Mon Sep 17 00:00:00 2001 From: fogelito Date: Mon, 13 Feb 2023 19:24:29 +0200 Subject: [PATCH] env variables --- .env | 2 +- app/controllers/api/databases.php | 6 +++--- app/views/install/compose.phtml | 3 +++ docker-compose.yml | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 97578ca0fb..f5078ab152 100644 --- a/.env +++ b/.env @@ -86,7 +86,7 @@ _APP_GRAPHQL_MAX_COMPLEXITY=250 _APP_GRAPHQL_MAX_DEPTH=3 _APP_SLOW_QUERIES_MAX_HITS=2 _APP_SLOW_QUERIES_TIMEOUT=200 -_APP_SLOW_QUERIES_ACTIVE=1 +_APP_SLOW_QUERIES=1 DOCKERHUB_PULL_USERNAME= DOCKERHUB_PULL_PASSWORD= DOCKERHUB_PULL_EMAIL= \ No newline at end of file diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 618986481c..56fc37896a 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -2123,10 +2123,10 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') $filterQueries = Query::groupByType($queries)['filters']; - var_dump('_APP_SLOW_QUERIES_ACTIVE'); - var_dump(App::getEnv('_APP_SLOW_QUERIES_ACTIVE')); + var_dump('_APP_SLOW_QUERIES'); + var_dump(App::getEnv('_APP_SLOW_QUERIES')); - $timeout = App::getEnv('_APP_SLOW_QUERIES_ACTIVE') === 'true' ? App::getEnv('_APP_SLOW_QUERIES_TIMEOUT') : null; + $timeout = App::getEnv('_APP_SLOW_QUERIES') === '1' ? App::getEnv('_APP_SLOW_QUERIES_TIMEOUT') : null; if ($documentSecurity && !$valid) { $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, $timeout); diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 2070043399..262899a38d 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -156,6 +156,9 @@ services: - _APP_GRAPHQL_MAX_BATCH_SIZE - _APP_GRAPHQL_MAX_COMPLEXITY - _APP_GRAPHQL_MAX_DEPTH + - _APP_SLOW_QUERIES_MAX_HITS + - _APP_SLOW_QUERIES_TIMEOUT + - _APP_SLOW_QUERIES appwrite-realtime: image: /: diff --git a/docker-compose.yml b/docker-compose.yml index b0bd567666..2f9f20c5af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,7 +83,6 @@ services: - ./docs:/usr/src/code/docs - ./public:/usr/src/code/public - ./src:/usr/src/code/src - - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database depends_on: - mariadb - redis @@ -177,6 +176,9 @@ services: - _APP_GRAPHQL_MAX_BATCH_SIZE - _APP_GRAPHQL_MAX_COMPLEXITY - _APP_GRAPHQL_MAX_DEPTH + - _APP_SLOW_QUERIES_MAX_HITS + - _APP_SLOW_QUERIES_TIMEOUT + - _APP_SLOW_QUERIES appwrite-realtime: entrypoint: realtime