Christy Jacob
cd5f6f58a2
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-05-24 12:43:56 +00:00
shimon
355e2dc266
updating composer
2024-05-22 16:45:30 +03:00
shimon
7c71e44250
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-get-env-sn
2024-05-22 16:39:42 +03:00
shimon
6639714a1b
updating composer
2024-05-22 16:37:45 +03:00
shimon
6e79d33ca2
Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg
...
Conflicts:
composer.lock
2024-05-22 16:01:40 +03:00
Binyamin Yawitz
ab0d6f7c19
refactor(messaging worker): Refactoring local device to worker only
2024-05-21 15:48:53 -04:00
fogelito
795b595052
Remove throw
2024-05-21 10:18:13 +03:00
Christy Jacob
10722aa736
chore: cleanup obsolete tasks and workers
2024-05-16 07:11:00 +00:00
Jake Barnby
912e3b01dc
Add clarifying comments
2024-05-07 14:07:04 +12:00
Jake Barnby
5e62007c8f
Fix dbForProject resources
2024-05-06 21:19:19 +12:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail
2024-05-06 18:13:41 +12:00
shimon
27e460671b
Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg
2024-05-06 08:59:03 +03: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
shimon
8588bb4555
getEnv on worker.php
2024-04-25 19:31:30 +03: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
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
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
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
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
shimon
22e7c58d7d
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts
2024-02-19 17:38:13 +02: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
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
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
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
shimon
6ad63b6f7b
addressing comments
2024-01-17 10:44:16 +02: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