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
Bradley Schofield
b60c591f8f
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-02-13 09:45:59 +00: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
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
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
shimon
b09386727b
Usage logs text update
2024-02-10 10:34:44 +02:00
Bradley Schofield
0f3a1c3762
Merge branch 'main' into 1.5.x-response-request-models
2024-02-09 12:36:02 +00:00
shimon
d0985db27d
interval update
2024-02-09 13:22:48 +02:00
shimon
3788d5bceb
interval update
2024-02-09 12:56:37 +02:00
shimon
c1fb4ecf39
interval update
2024-02-08 21:41:23 +02:00
shimon
a1539395c6
interval update
2024-02-08 21:08:29 +02:00
shimon
72ee7d7f34
interval update
2024-02-08 20:51:54 +02:00
Christy Jacob
2fdd0656d0
Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn
2024-02-08 11:48:53 +00:00
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +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
6a6c3445fa
updates
2024-02-04 20:02:01 +02:00
shimon
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
shimon
1ef5c9bfcd
removed var_dump leftovers
2024-02-01 10:32:40 +02:00
shimon
ca65f4ab2f
sync against main
2024-01-31 20:22:49 +02:00
shimon
5518ca165e
remarks
2024-01-30 13:24:57 +02:00
shimon
7a2ee683e3
refactor usage poc
2024-01-28 11:28:59 +02:00
shimon
b024cb5614
removed debug lines
2024-01-25 13:42:43 +02:00
shimon
37316f97ff
adding debug output to usage-worker
2024-01-18 18:52:20 +02:00
shimon
d1751565cf
refactor usage worker
2023-12-24 20:38:15 +02:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00:00
shimon
ef347f65b8
usage workers
2023-10-25 11:41:42 +03:00
shimon
b7675df9b9
usage workers
2023-10-25 11:38:44 +03:00
