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
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
379c79dae9
Consistent naming for device resources
2024-02-21 03:10:51 +13:00
Jake Barnby
2667d1fb07
Inject always local file device
2024-02-21 02:50:44 +13:00
Jake Barnby
439e7b1ccf
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
...
# Conflicts:
# app/worker.php
# src/Appwrite/Platform/Workers/Messaging.php
2024-02-21 02:00:46 +13:00
Jake Barnby
2f711c84ed
Remove callback resources from workers
2024-02-21 00:40:55 +13:00
Jake Barnby
022c4678ec
Allow attaching files from storage to emails
2024-02-20 00:08:57 +13:00
shimon
ed4319314a
Addressed comments
2024-02-15 17:15:10 +02:00
shimon
2a5f21e982
Addressed comments
2024-02-15 17:12:37 +02: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
7a2ee683e3
refactor usage poc
2024-01-28 11:28:59 +02:00
Torsten Dittmann
62e459c581
fix: workers
2024-01-24 12:29:36 +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
Matej Bačo
2be504ed8a
fix pool is empty webhook worker
2024-01-18 09:13:11 +00:00
Matej Bačo
ed28bb9295
Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging
2024-01-11 10:22:50 +00: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
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
23b39fee02
FIx FCM tests
2023-12-17 12:41:20 +13: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
5c3bd741b4
fix resources
2023-12-12 11:26:14 +00:00
Damodar Lohani
d8fe96e300
set project resource
2023-12-12 11:08:14 +00:00
Damodar Lohani
104b8bb366
provide retention time as queue server resource
2023-12-12 08:07:24 +00:00
Bradley Schofield
dea3e74b6a
Implement Job based hamster
2023-11-28 10:19:55 +00:00
Matej Bačo
9fb6525063
Add new tags from worker, fix queue name
2023-11-22 14:50:57 +01:00
Prateek Banga
3ade88897c
Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x
2023-11-10 12:49:05 +05:30
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
Jake Barnby
995c404f35
Update db
2023-10-26 21:24:30 +13:00
Torsten Dittmann
404ad8653d
fix: worker permissions reset
2023-10-25 19:23:55 +02:00
shimon
14ac780180
workers start hook
2023-10-25 12:10:30 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
prateek banga
af40c63357
review changes
2023-10-20 17:02:13 +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
shimon
593e5ab316
some fixes
2023-10-17 22:08:01 +03:00
shimon
3d5930c104
some fixes
2023-10-17 16:55:08 +03:00
shimon
55dfb0b034
Merge remote-tracking branch 'origin/refactor-workers-sn' into refactor-workers-sn
2023-10-17 06:44:53 +03:00
shimon
9a6d88a819
addressing some comments
2023-10-17 06:44:36 +03:00
Shimon Newman
e565557eb2
Update app/worker.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-16 20:13:39 +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
shimon
66c57c9a4f
Merge remote-tracking branch 'origin/refactor-workers' into refactor-workers
2023-10-12 16:34:31 +03:00
shimon
4088941f70
sync with main
2023-10-12 16:34:13 +03:00
Jake Barnby
dc580c3d0d
Change name
2023-10-12 20:15:16 +13:00
Jake Barnby
e2a8369712
Add docblock for env vars
2023-10-12 19:11:08 +13:00
Jake Barnby
effdeb4bc2
Fix env vars
2023-10-12 19:10:45 +13:00
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 6f4230548469abd222e8
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
shimon
2cd4514086
sync with main
2023-10-11 16:03:15 +03:00
