Commit graph

299 commits

Author SHA1 Message Date
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
shimon
7df94fcee6 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
 Conflicts:
	composer.json
	composer.lock
2024-04-07 18:17:16 +03:00
Jake Barnby
e224ca440b
Allow setting event parameters as sensitive 2024-04-03 16:36:21 +13: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
5ce3de4933 Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines 2024-04-02 02:13:15 +02:00
Jake Barnby
c7bf9bb3ec
Debug 2024-03-12 17:09:09 +01:00
Jake Barnby
cfc69b0f92
Debug 2024-03-12 16:54:06 +01:00
Steven Nguyen
b19efb619b
feat(events): update build event reset to reset everything
Instead of using setType('') to prevent events from triggering, it
makes more sense to use reset(). However, reset() didn't properly
reset type, resource, deployment, or template. This change makes
sure to reset all those private variables.
2024-03-11 11:17:40 +01:00
Matej Bačo
005a239932 Auth fixes 2024-03-07 18:24:01 +01:00
Torsten Dittmann
dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Matej Bačo
5a7c43ab32 Introduce code analysis 2024-03-07 10:59:08 +01:00
Torsten Dittmann
0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
shimon
dfac3d585a Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-03-06 17:58:58 +01:00
Torsten Dittmann
a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Damodar Lohani
9fe0a5a31b
Update Mail.php 2024-02-24 21:03:18 +05:45
Damodar Lohani
d91a0e3048 reset variables 2024-02-24 14:56:53 +00:00
Damodar Lohani
ea484e593b format 2024-02-24 14:49:17 +00:00
Damodar Lohani
ca1c83c2cf method to reset attachment 2024-02-24 14:33:38 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
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
b265106af2
Fix tests 2024-02-21 02:20:09 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
Shimon Newman
3f7d35065e
Merge pull request #7614 from appwrite/chore-usage-queue-health
usage/usage-dump queue health endpoints
2024-02-20 09:59:52 +02:00
shimon
22e7c58d7d Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-02-19 17:38:13 +02:00
shimon
2a5f21e982 Addressed comments 2024-02-15 17:12:37 +02:00
shimon
62ee10493b usage sms per country code count 2024-02-15 10:10:01 +02:00
shimon
dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
shimon
8c44627da1 Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	src/Appwrite/Platform/Services/Workers.php
2024-02-13 10:29:17 +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
shimon
93a99b561c remove debug lines 2024-02-07 11:54:18 +02: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
shimon
44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00
shimon
7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02: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
Matej Bačo
20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00:00
shimon
1da476e5ac remove cloud related scripts 2024-01-09 11:13:58 +02:00
shimon
03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +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
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
Damodar Lohani
ffdc662022 fix formatting 2023-12-09 06:41:24 +00:00
Damodar Lohani
e4467521f8
Merge branch 'refactor-usage-sn' into feat-mail-template-override-ur 2023-12-09 07:36:11 +01:00
Damodar Lohani
e3bab623f1 fix redis issue by encoding content 2023-12-08 21:34:39 +00:00
Damodar Lohani
386cee5137 mail support string as attachment 2023-12-08 19:57:15 +00:00
Damodar Lohani
83d4de9f73
support maile template override 2023-12-06 14:52:13 +01:00
德华 刘
d4ff696173 chore: fix linter issues 2023-11-30 20:35:18 +00:00
德华 刘
d34050a5df chore: address review comments 2023-11-30 16:22:26 +00:00
Jake Barnby
4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13:00
Bradley Schofield
dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
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
prateek banga
549dcc493d lint fix 2023-11-16 01:33:05 +05:30
prateek banga
c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon
56f565bf30 addressing some comments 2023-10-17 07:23:33 +03:00
shimon
e8dbd043ec addressing some comments 2023-10-17 07:02:54 +03:00
shimon
9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
shimon
0e2cf14e12 minor fix 2023-10-16 18:17:13 +03:00
Shimon Newman
710ac707e3
Update src/Appwrite/Event/Audit.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-16 18:11:29 +03:00
Prateek Banga
0b1b7646d5 review changes 2023-10-13 18:26:54 +05:30
Jake Barnby
1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
Jake Barnby
096a529618
Revert "Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process"
This reverts commit 6f42305484, reversing
changes made to 69abd222e8.
2023-10-12 15:30:01 +13:00
Jake Barnby
6f42305484
Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process
# Conflicts:
#	bin/worker-databases
#	src/Appwrite/Event/Database.php
#	src/Appwrite/Platform/Workers/Databases.php
2023-10-12 15:28:52 +13:00
Jake Barnby
69abd222e8
Simplify 2023-10-12 15:26:01 +13:00
Jake Barnby
7a78f49eb9
Allow multiprocess for db queue 2023-10-12 15:23:16 +13:00
Jake Barnby
5d845208d9
Simplify 2023-10-12 15:02:53 +13:00
Jake Barnby
d238d79e29
Allow multiprocess for db queue 2023-10-11 21:28:29 +13:00
Prateek Banga
a77a212e2c adds scheduling for messaging worker 2023-10-09 17:29:26 +05:30
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga
22d445587e review changes 2023-10-05 16:57:48 +05:30
Prateek Banga
48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +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
Prateek Banga
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Binyamin Yawitz
5cb03da001 Extracting function event validator to its own class. 2023-09-11 23:24:11 -04:00
prateek banga
38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
shimon
ec93239630 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/api/storage.php
	app/controllers/shared/api.php
	app/init.php
	app/workers/deletes.php
2023-09-05 19:19:59 +03:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Bradley Schofield
77aa48c22a Update Mail.php 2023-08-28 06:53:29 +01:00
Bradley Schofield
608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo
ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Matej Bačo
c24e2786fb Even more PR review changes 2023-08-11 18:52:13 +02:00
Matej Bačo
f0125ac3bb PR review changes 2023-08-11 18:44:05 +02:00
Matej Bačo
c6684ee7f8 PR review changes 2023-08-11 16:45:36 +02:00
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Bradley Schofield
91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Bradley Schofield
8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Matej Bačo
280b2fc994 Rename repositories and installation IDs 2023-07-30 11:51:13 +02:00
Khushboo Verma
1ed5d395be Add vcs prefix to variable names 2023-07-28 13:11:26 +05:30
shimon
2f7b0c9938 added bucketId to cache::deleteByResource 2023-07-22 17:31:33 +03:00
shimon
bed88baa6c added bucketId to cache::deleteByResource 2023-07-22 17:08:28 +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
Matej Bačo
3a8f4e5039 Fix failing builds 2023-06-28 13:31:35 +02:00
Khushboo Verma
860b4fb1c0 WIP: Build from template 2023-06-17 17:43:02 +05:30
shimon
d820d93ac7 databases worker 2023-06-04 19:25:56 +03:00
shimon
0d2987620c refactor workers 2023-06-04 11:19:49 +03:00
Christy Jacob
36f1791a92 chore: linter 2023-06-02 17:59:20 +05:30
shimon
6e7c160249 changing event signature 2023-06-02 06:54:34 +03:00
Steven Nguyen
2ee7a3a356
Prevent triggering a function off of a function 2023-05-31 16:02:46 -07:00
shimon
f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
shimon
432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
Matej Bačo
18105d4999 Remove repository owner 2023-05-22 15:02:55 +02:00
Matej Bačo
6e515e3cc4 Copy Khushboo's integration from feat-peach-q1-kh 2023-05-22 12:58:13 +02:00
Damodar Lohani
518c177c23 fix error 2023-05-11 07:51:39 +00:00
Damodar Lohani
472265497b fix formatting and error 2023-05-11 06:12:39 +00:00
Damodar Lohani
b147cadaa2 don't overwrite the paused state from the event 2023-04-26 08:41:22 +00:00
Damodar Lohani
b5379f0f0c feature to pause events 2023-04-26 08:37:38 +00:00
Damodar Lohani
0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Matej Baco
ed610fcdd4 Address TODOs 2023-03-14 11:13:03 +00:00
Damodar Lohani
82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
Damodar Lohani
68aed2c691 update getter and setter 2023-03-13 06:23:23 +00:00
Damodar Lohani
3b900c5dfb get and set SMTP config in mail event 2023-03-12 02:12:09 +00:00
Damodar Lohani
5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Matej Bačo
e4d784c871 Add new V3 parameters 2023-02-14 11:01:38 +00:00
shimon
9a2f734d3a compose.lock 2023-01-12 18:06:20 +02:00
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
shimon
4198cbfca5 moved reduce after delete document to usage-worker 2022-12-28 18:27:26 +02:00
shimon
5e394fed5d refactor usage worker 2022-12-21 21:03:09 +02:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield
1cd84aacc7 Update Event.php 2022-12-20 13:06:57 +00:00
Bradley Schofield
b0c8e8980d Continue removing resque 2022-12-20 12:48:55 +00:00
Bradley Schofield
886a1a2abb Port Deletes and Builds worker 2022-12-20 12:22:58 +00:00
Bradley Schofield
f2e8a619da Merge branch 'refactor-scheduler-messaging' into refactor-schedulers-workers 2022-12-20 11:24:58 +00:00
Bradley Schofield
6f3a057608 Merge branch 'refactor-scheduler-emails' into refactor-schedulers-workers 2022-12-20 11:24:26 +00:00
Bradley Schofield
11bd518b6a Merge branch 'refactor-scheduler-database' into refactor-schedulers-workers 2022-12-20 11:23:26 +00:00
Bradley Schofield
169386d0b3 Merge branch 'refactor-sceduler-certificates' into refactor-schedulers-workers 2022-12-20 11:20:52 +00:00
Bradley Schofield
d52fa1169a Merge Audits 2022-12-20 11:11:36 +00:00
Bradley Schofield
a09e23d0b9 Start work on porting webhooks 2022-12-20 11:07:49 +00:00
shimon
18f192ed65 benchmarks 2022-12-19 10:25:49 +02:00
Bradley Schofield
ab7c04074c Update Phone.php 2022-12-17 21:23:15 +00:00
Bradley Schofield
a8595eaca2 Port Messages worker to Utopia queue system 2022-12-17 20:45:58 +00:00
Bradley Schofield
2e49666ee6 Port Mail Worker from resque to Utopia Queue 2022-12-17 19:19:41 +00:00
shimon
7601c9047b e2e tests 2022-12-15 11:45:43 +02:00
shimon
285bfe9fd7 e2e tests 2022-12-15 09:56:06 +02:00
Damodar Lohani
42c855cb41 feat: make mails event and worker general 2022-12-14 06:23:14 +00:00
Bradley Schofield
6e6a6d5518 Migrate Database worker to Utopia Queue system 2022-12-13 15:54:01 +00:00
Bradley Schofield
21afa43127 Port Certificates to new Queue system 2022-12-13 11:16:12 +00:00
shimon
4c6b6d00e8 functions api usage 2022-12-07 19:56:38 +02:00
Bradley Schofield
84f1a15a4c Refactor Audit Worker to use Utopia Queue system 2022-12-06 15:06:40 +00:00
shimon
f44ee4ec90 updates 2022-12-06 13:36:17 +02:00
shimon
b71bba2a9c updates 2022-12-04 19:06:23 +02:00
Eldad Fux
db345fae41 WIP 2022-11-24 09:53:52 +02:00
Matej Baco
418a432d6c Merge branch 'feat-db-pools' into fix-init-retry 2022-11-18 08:10:11 +01:00
Christy Jacob
080abbbb79 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console 2022-11-17 20:26:10 +05:30
Matej Baco
2220222f48 Merge branch 'feat-db-pools' into fix-init-retry 2022-11-16 20:43:31 +01:00