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
Torsten Dittmann
3476ab2627
dev: introduce redis insights
2024-02-13 12:26:02 +00: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
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +02:00
shimon
632f78140f
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
...
Conflicts:
composer.json
composer.lock
2024-02-08 09:29:12 +02:00
Khushboo Verma
1fefb7e133
Add a 20 second delay to maintenance worker
2024-02-05 15:01:23 +05:30
shimon
6a6c3445fa
updates
2024-02-04 20:02:01 +02:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Khushboo Verma
7b4f334f31
Update error message
2024-02-02 19:30:54 +05:30
Jake Barnby
01d92d3125
Merge pull request #7526 from appwrite/feat-update-containers
...
Update containers
2024-02-02 22:23:11 +13:00
Khushboo Verma
0ea7b28a6b
Resolve merge conflicts
2024-02-02 12:53:25 +05:30
Torsten Dittmann
9c0bd9fc6e
Merge pull request #7489 from appwrite/update-webhook-abuse-limit
...
Add webhook max failed attempts as env variable
2024-02-01 13:34:57 +01:00
Jake Barnby
9051c31a02
Update traefik, mariadb, redis containers
2024-02-01 02:36:35 +13:00
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
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
Christy Jacob
2ff7c5ac8e
chore: rename env variable
2024-01-29 20:07:17 +00:00
Christy Jacob
dc6f9e6d59
chore: add new env variable
2024-01-29 20:01:14 +00:00
Khushboo Verma
f4426d553c
Throw 451 exception
2024-01-29 16:49:13 +05:30
Matej Bačo
36ce992e9f
Add API Tokens
2024-01-29 11:15:07 +00:00
Khushboo Verma
4cd5999bb3
Merge branch '1.5.x' into feat-block-countries
2024-01-29 16:25:31 +05:30
shimon
7a2ee683e3
refactor usage poc
2024-01-28 11:28:59 +02:00
Khushboo Verma
e4b3f652e7
Add webhook abuse as env variable
2024-01-26 21:25:35 +05:30
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
Torsten Dittmann
9f5a0312cf
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 11:24:59 +01:00
Khushboo Verma
c07a3889e6
WIP: Add new group to api.php
2024-01-24 14:41:35 +05:30
fogelito
3689435176
Arrays tests
2024-01-21 10:10:18 +02:00
Khushboo Verma
a134ca7efd
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-19 17:12:14 +05:30
Khushboo Verma
3e5443f127
Add env variables to mails worker instead of webhooks worker
2024-01-19 17:09:48 +05:30
shimon
a0b38a5a7c
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
2024-01-18 14:19:19 +02:00
Khushboo Verma
d443602cbc
resolve merge conflicts
2024-01-12 01:55:32 +05:30
Jake Barnby
322dae626a
Merge branch '1.5.x' into feat-message-scheduling
2024-01-11 22:29:49 +13:00
Jake Barnby
aca07a20c7
Merge branch 'main' into 1.5.x
2024-01-11 22:28:50 +13:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
2024-01-11 19:59:59 +13:00
Jake Barnby
38e9aefa2f
Update compose
2024-01-11 16:14:38 +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
loks0n
310d75b6be
feat: update assistant
2024-01-10 10:17:52 +00:00
Khushboo Verma
b3e87d7de8
Formatted email as per design
2024-01-10 01:55:36 +05:30
shimon
1da476e5ac
remove cloud related scripts
2024-01-09 11:13:58 +02:00
Torsten Dittmann
0a17e2bce9
feat: add new env variable to compsoe files
2024-01-02 19:53:37 +00: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
Torsten Dittmann
cc1272f80b
feat: add new env variable to compsoe files
2023-12-29 22:09:59 +01:00
shimon
d1751565cf
refactor usage worker
2023-12-24 20:38:15 +02:00
Khushboo Verma
557565b949
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-15 01:46:47 +05:30
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
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
德华 刘
49bb3444bf
chore: add logs
2023-11-30 21:11:31 +00:00
Bradley Schofield
dea3e74b6a
Implement Job based hamster
2023-11-28 10:19:55 +00:00
Khushboo Verma
2bcb6c18fb
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-11-20 17:40:32 +05:30
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
Khushboo Verma
3f584b85be
Limit webhook failure attempts to 10
2023-11-14 14:20:26 +05:30
Prateek Banga
270e6e7c15
review changes
2023-11-02 16:43:24 +05:30
prateek banga
0dafc59cc2
converted env vars to dsn format
2023-10-31 02:05:50 +05:30
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
prateek banga
6c260223ba
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 15:00:22 +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
Matej Bačo
20c37db8fc
Upgrade executor
2023-10-19 11:54:56 +02:00
prateek banga
99b5ac8669
adds push and sms controllers
2023-10-19 13:29:48 +05:30
Christy Jacob
20985c7ee4
Merge pull request #6946 from appwrite/remove-resque
...
chore: remove resque library and update health check endpoints
2023-10-18 16:59:44 -04:00
Christy Jacob
be26e4b729
chore: remove resque library and update health check endpoints
2023-10-18 19:44:06 +00:00
Christy Jacob
f822f86517
Merge branch '1.4.x' into refactor-workers-sn
2023-10-18 15:26:45 -04:00
Christy Jacob
67642f9f91
chore: update docker compose config
2023-10-18 01:56:05 +04:00
shimon
b42a9e94e2
some fixes
2023-10-17 18:12:24 +03:00
shimon
3d5930c104
some fixes
2023-10-17 16:55:08 +03:00
Matej Bačo
97ea29bba2
Add dart 3.1 support
2023-10-17 10:18:29 +02:00
shimon
9a6d88a819
addressing some comments
2023-10-17 06:44:36 +03:00
Prateek Banga
4ccffb6649
adds graphql tests for topics, subcribers, email
2023-10-17 03:41:42 +05:30
shimon
a8f5886474
minor fix
2023-10-16 18:17:02 +03:00
shimon
0e2c1c1f2d
small fixes
2023-10-16 16:20:41 +03:00
shimon
0c776e0a44
comparing $workersCount via worker.php vs init php
2023-10-16 11:04:44 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Jake Barnby
48bc369149
Hardcode default queue for db worker only
2023-10-12 21:32:33 +13:00
Jake Barnby
8c92170cb6
Add missing workers num
2023-10-12 20:22:26 +13:00
Jake Barnby
dc580c3d0d
Change name
2023-10-12 20:15:16 +13:00
Jake Barnby
34e7af806a
Fix typo
2023-10-12 20:10:44 +13:00
Jake Barnby
855fe5b893
Remove redundant postfix
2023-10-12 19:12:26 +13:00
Jake Barnby
6a05d9606e
Remove default number postfix
2023-10-12 18:55:01 +13:00
Jake Barnby
1ac3372239
Set queue name per worker
2023-10-12 17:55:30 +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
c0c6197cff
Remove static queue set for database worker
2023-10-12 15:19:42 +13:00
Jake Barnby
d7b87d7bae
Add env var for db queues
2023-10-12 15:19:17 +13:00
shimon
893b1d0ba7
Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.gitmodules
app/controllers/api/functions.php
app/controllers/api/health.php
app/init.php
app/views/install/compose.phtml
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Functions.php
src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
Prateek Banga
bb52647366
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-10 19:06:39 +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
Steven Nguyen
623b2f97da
Ensure openruntimes-executor restarts after a server reboot
...
Every other service restarts automatically after a server reboot so
the openruntimes-executor should too. Otherwise, function executions
will fail as the executor is unavailable.
2023-10-05 14:25:50 -07:00
shimon
948f36a023
sync with 1.4
2023-10-05 16:15:39 +03:00
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
Matej Bačo
0f3ce658c2
Upgrade executor
2023-10-04 09:10:50 +02:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +03:00
Steven Nguyen
43f491c5bf
Bump appwrite-assistant to prevent it from crashing w/o open ai key
2023-09-27 10:46:48 -07: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
Prateek Banga
e2acb608fa
fix tests with real sms providers
2023-09-21 22:16:02 +05:30
Christy Jacob
864092d81c
Merge pull request #6272 from appwrite/feat-router-protection
...
Feat: router protection
2023-09-21 05:13:34 -04:00
Christy Jacob
f78b520f12
Merge pull request #6269 from appwrite/feat-https-function-domains
...
Feat: Function domains force https
2023-09-21 05:11:06 -04:00
Matej Bačo
91e3f37443
Upgrade executor
2023-09-21 10:31:44 +02:00
Prateek Banga
a2e34b5b64
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-20 16:59:07 +05:30