1
0
Fork 0
mirror of synced 2024-06-14 16:54:52 +12:00
Commit graph

80 commits

Author SHA1 Message Date
Jake Barnby 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby a9d1aa5bca
Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
2024-02-21 13:00:48 +13:00
Jake Barnby 400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby 379c79dae9
Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby 2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby 14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Christy Jacob 7dbb1c6399
Merge branch 'main' into refactor-cache-poc 2024-02-15 20:33:57 +05:30
Jake Barnby afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby cbf1085850
Merge pull request #7135 from appwrite/remove-deletes-db-leftovers
Remove database methods from deletes worker
2024-02-13 23:13:24 +13:00
Bradley Schofield b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
Jake Barnby 66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby 37522ea66f
Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon 6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13: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 a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby 465bc81071
Add deletes job to delete targets tied to a particular session 2024-02-03 03:06:31 +13:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
Christy Jacob 7b5be4e154 chore: update team membership deletion 2024-01-30 08:42:46 +00:00
Christy Jacob 6c09d04038 fix: use atomic operations for count updates 2024-01-29 10:54:58 +00:00
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +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
Jake Barnby 89343704f7
Rename deleteTargetSubscribers method to make actions clearer 2024-01-26 00:41:05 +13:00
Jake Barnby e81ab1d1e0
Remove redundant document pass through 2024-01-26 00:35:04 +13:00
Jake Barnby 7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Torsten Dittmann d13023f23c fix: deletes worker 2024-01-24 11:42:04 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Jake Barnby 9fc68d23a0
Fix delete type for expired targets 2024-01-19 17:23:44 +13:00
Jake Barnby 4c10e78e42
Merge remote-tracking branch 'origin/1.5.x' into feat-maintenance-delete-expired-targets
# Conflicts:
#	app/init.php
2024-01-19 16:56:51 +13:00
Jake Barnby 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Steven Nguyen d670c07ca4
Delete subscribers and update topic totals when deleting target 2024-01-17 22:56:56 +00:00
Jake Barnby 4cc6d4161d
Merge branch 'feat-message-scheduling' into feat-maintenance-delete-expired-targets 2024-01-15 20:33:38 +13:00
Jake Barnby 4d9fb1d687
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	src/Appwrite/Platform/Workers/Messaging.php
2024-01-15 20:07:01 +13:00
Jake Barnby 772617f231
Mark invalid targets on message send then delete on maintenance sweep 2024-01-15 19:52:40 +13:00
Jake Barnby f25dd32767
Fix delete callback 2024-01-15 19:00:41 +13:00
Jake Barnby 78fe9ebb37
Fix invalid coalesce 2024-01-15 18:26:30 +13:00
Jake Barnby 513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Matej Bačo 92c4c52a81 QA changes 2024-01-02 13:02:11 +00:00
Matej Bačo 0ba768125d Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging 2024-01-02 11:08:47 +00:00
Damodar Lohani bfbcecd069 fix deletes worker 2023-12-20 11:26:57 +00:00
Damodar Lohani 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Damodar Lohani 7891f9e74c refactor deletes worker 2023-12-12 11:26:44 +00:00
Damodar Lohani 104b8bb366 provide retention time as queue server resource 2023-12-12 08:07:24 +00:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
prateek banga 6ead6f8094 misc changes
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
shimon 1869852985 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/controllers/shared/api.php
	composer.lock
	src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
Matej Bačo 9fb6525063 Add new tags from worker, fix queue name 2023-11-22 14:50:57 +01:00