1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Commit graph

96 commits

Author SHA1 Message Date
Jake Barnby 912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12:00
Jake Barnby 52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby ec2878b505
Lint 2024-05-06 17:34:17 +12:00
Jake Barnby db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
Jake Barnby c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Matej Bačo 1234770dc8 CI/CD fixes 2024-04-02 18:48:12 +02:00
Matej Bačo d091b37a15 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-02 18:42:17 +02:00
Eldad Fux 8ed1da4ea8 Updated getEnv to use system lib 2024-04-01 13:02:47 +02:00
Jake Barnby 664df69a5f
Fix method refs 2024-03-07 17:49:59 +01:00
Jake Barnby 8a73203635
Revert debugs 2024-03-07 14:52:13 +01:00
Jake Barnby 1db9d8b9ab
Fix method refs 2024-03-07 10:40:03 +01:00
Jake Barnby 2bed17de35
Debug 2024-03-06 21:50:31 +01:00
Jake Barnby 3312ed1c5d
Debug 2024-03-06 21:14:55 +01:00
Torsten Dittmann 0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
Jake Barnby 1b7ce8fc61
Debug 2024-03-06 10:59:05 +01:00
Jake Barnby c768375e13
Set tenant for CLI scope db 2024-03-04 20:54:35 +01:00
Jake Barnby 74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +01:00
Steven Nguyen 4ace8ed027
Replace catching \Exception with \Throwable
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
shimon be829e2db4 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	docker-compose.yml
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	src/Appwrite/Platform/Workers/Hamster.php
2024-01-30 20:47:35 +02:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
shimon 6ad63b6f7b addressing comments 2024-01-17 10:44:16 +02:00
shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Jake Barnby 121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby 018b7c38bd
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
# Conflicts:
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-08 13:34:28 +01:00
Bradley Schofield dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
Jake Barnby 35163ff52a
Check project shareTables status when configuring databases 2023-11-23 01:13:24 +13:00
Jake Barnby 464b913e90
Update for function name change 2023-11-22 21:32:36 +13:00
shimon f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby 5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata
# Conflicts:
#	app/init.php
#	composer.json
#	composer.lock
2023-10-25 18:21:16 +13:00
Christy Jacob 67541d4a1d chore: review comments 2023-10-18 21:35:15 +00:00
Jake Barnby bb0744842d
Set metadata for all database instantiations 2023-10-18 16:21:10 +13:00
shimon 9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
shimon 4088941f70 sync with main 2023-10-12 16:34:13 +03:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Steven Nguyen ebe114617e
Fix "Pool 'console' is empty" error by breaking from loop when ready 2023-08-21 15:53:30 -07:00
Steven Nguyen a13b7606a2
Fix console db namespace 2023-08-21 15:53:30 -07:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
shimon d1d1392bb3 small adjustments 2023-07-12 11:12:56 +03:00
shimon e950945170 users addition 2023-07-11 18:46:21 +03:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Damodar Lohani 57411db2d3 upadate to use refactored collections config 2023-06-15 00:34:12 +00:00
shimon 57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
shimon 62c619434e functions/builds/deletes worker 2023-06-05 19:13:00 +03:00
shimon 98dc1db878 re-working worker flow 2023-05-23 16:43:03 +03:00
Bradley Schofield c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield 886a1a2abb Port Deletes and Builds worker 2022-12-20 12:22:58 +00:00