From 31466c44d8c8ab4087380b2e26371e980a977707 Mon Sep 17 00:00:00 2001 From: shimon Date: Sun, 8 Oct 2023 16:44:14 +0300 Subject: [PATCH 1/2] update projects database --- app/controllers/api/projects.php | 10 ++++++++++ composer.lock | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index c0ce213789..a59803972d 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -100,6 +100,7 @@ App::post('/v1/projects') $databases = Config::getParam('pools-database', []); + /** * Extract db from list while backing */ @@ -167,6 +168,15 @@ App::post('/v1/projects') throw new Exception(Exception::PROJECT_ALREADY_EXISTS); } + /** + * Update database with self-managed db every $mod projects + */ + $mod = 2; + if ($index = array_search('db_fra1_sm1_0', $databases) && $project->getInternalId() % $mod === 0) { + $project->setAttribute('database', $databases[$index]); + $dbForConsole->updateDocument('projects', $project); + } + $dbForProject = new Database($pools->get($database)->pop()->getResource(), $cache); $dbForProject->setNamespace("_{$project->getInternalId()}"); $dbForProject->create(); diff --git a/composer.lock b/composer.lock index 288a17101f..546c1000d0 100644 --- a/composer.lock +++ b/composer.lock @@ -1050,16 +1050,16 @@ }, { "name": "matomo/device-detector", - "version": "6.1.5", + "version": "6.1.6", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "40ca2990dba2c1719e5c62168e822e0b86c167d4" + "reference": "5cbea85106e561c7138d03603eb6e05128480409" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/40ca2990dba2c1719e5c62168e822e0b86c167d4", - "reference": "40ca2990dba2c1719e5c62168e822e0b86c167d4", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/5cbea85106e561c7138d03603eb6e05128480409", + "reference": "5cbea85106e561c7138d03603eb6e05128480409", "shasum": "" }, "require": { @@ -1115,7 +1115,7 @@ "source": "https://github.com/matomo-org/matomo", "wiki": "https://dev.matomo.org/" }, - "time": "2023-08-17T16:17:41+00:00" + "time": "2023-10-02T10:01:54+00:00" }, { "name": "mongodb/mongodb", @@ -6017,5 +6017,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" } From 00d2a5ffcd4491dcb9cb32acd6761b5c660f6125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=8D=8E=20=E5=88=98?= Date: Sun, 22 Oct 2023 18:33:15 +0000 Subject: [PATCH 2/2] chore: update create projects endpoints --- app/controllers/api/projects.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 10669af3d8..eb657c116d 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -92,12 +92,12 @@ App::post('/v1/projects') $projectId = ($projectId == 'unique()') ? ID::unique() : $projectId; - $backups['database_db_fra1_v14x_02'] = ['from' => '03:00', 'to' => '04:00']; - $backups['database_db_fra1_v14x_03'] = ['from' => '00:00', 'to' => '01:00']; - $backups['database_db_fra1_v14x_04'] = ['from' => '00:00', 'to' => '01:00']; - $backups['database_db_fra1_v14x_05'] = ['from' => '00:00', 'to' => '01:00']; - $backups['database_db_fra1_v14x_06'] = ['from' => '00:00', 'to' => '01:00']; - $backups['database_db_fra1_v14x_07'] = ['from' => '00:00', 'to' => '01:00']; + $backups['database_db_fra1_v14x_02'] = ['from' => '03:00', 'to' => '05:00']; + $backups['database_db_fra1_v14x_03'] = ['from' => '00:00', 'to' => '02:00']; + $backups['database_db_fra1_v14x_04'] = ['from' => '00:00', 'to' => '02:00']; + $backups['database_db_fra1_v14x_05'] = ['from' => '00:00', 'to' => '02:00']; + $backups['database_db_fra1_v14x_06'] = ['from' => '00:00', 'to' => '02:00']; + $backups['database_db_fra1_v14x_07'] = ['from' => '00:00', 'to' => '02:00']; $databases = Config::getParam('pools-database', []); @@ -174,8 +174,8 @@ App::post('/v1/projects') /** * Update database with self-managed db every $mod projects */ - $mod = 2; - if ($index = array_search('db_fra1_sm1_0', $databases) && $project->getInternalId() % $mod === 0) { + $mod = 20; + if ($index = array_search('database_db_fra1_self_hosted_0_0', $databases) && $project->getInternalId() % $mod === 0) { $project->setAttribute('database', $databases[$index]); $dbForConsole->updateDocument('projects', $project); }