From 503495df16485aab68b27fdb964861db19b830c3 Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Wed, 15 May 2024 18:32:37 +0530 Subject: [PATCH 1/3] Update executor image name to exc-1 --- app/views/install/compose.phtml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 53e7e71518..f7fa18e3c0 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -727,7 +727,7 @@ services: openruntimes-executor: container_name: openruntimes-executor - hostname: appwrite-executor + hostname: exc-1 <<: *x-logging restart: unless-stopped stop_signal: SIGINT diff --git a/docker-compose.yml b/docker-compose.yml index 82c38ba269..f933d0a8c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -791,7 +791,7 @@ services: openruntimes-executor: container_name: openruntimes-executor - hostname: appwrite-executor + hostname: exc-1 <<: *x-logging stop_signal: SIGINT image: openruntimes/executor:0.5.1 @@ -857,7 +857,7 @@ services: - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG - OPR_PROXY_ALGORITHM=random - - OPR_PROXY_EXECUTORS=appwrite-executor + - OPR_PROXY_EXECUTORS=exc-1 - OPR_PROXY_HEALTHCHECK_INTERVAL=10000 - OPR_PROXY_MAX_TIMEOUT=600 - OPR_PROXY_HEALTHCHECK=enabled From d54986dc756fb68ea0dd32a2ed125f083eaaf77d Mon Sep 17 00:00:00 2001 From: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com> Date: Thu, 16 May 2024 05:31:44 +0000 Subject: [PATCH 2/3] fix(messaging): fix TextMagic class name The class name in utopia-php/mssaging is TextMagic so use the same here to prevent an error like: > Class "Utopia\Messaging\Adapter\SMS\Textmagic" not found ... --- src/Appwrite/Platform/Workers/Messaging.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php index c270018430..0399302e77 100644 --- a/src/Appwrite/Platform/Workers/Messaging.php +++ b/src/Appwrite/Platform/Workers/Messaging.php @@ -25,7 +25,7 @@ use Utopia\Messaging\Adapter\SMS as SMSAdapter; use Utopia\Messaging\Adapter\SMS\Mock; use Utopia\Messaging\Adapter\SMS\Msg91; use Utopia\Messaging\Adapter\SMS\Telesign; -use Utopia\Messaging\Adapter\SMS\Textmagic; +use Utopia\Messaging\Adapter\SMS\TextMagic; use Utopia\Messaging\Adapter\SMS\Twilio; use Utopia\Messaging\Adapter\SMS\Vonage; use Utopia\Messaging\Messages\Email; @@ -459,7 +459,7 @@ class Messaging extends Action return match ($provider->getAttribute('provider')) { 'mock' => new Mock('username', 'password'), 'twilio' => new Twilio($credentials['accountSid'], $credentials['authToken']), - 'textmagic' => new Textmagic($credentials['username'], $credentials['apiKey']), + 'textmagic' => new TextMagic($credentials['username'], $credentials['apiKey']), 'telesign' => new Telesign($credentials['customerId'], $credentials['apiKey']), 'msg91' => new Msg91($credentials['senderId'], $credentials['authKey'], $credentials['templateId']), 'vonage' => new Vonage($credentials['apiKey'], $credentials['apiSecret']), From 8ecc2ee787962a9f24d4548b11406770f020dcfb Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Thu, 16 May 2024 14:03:51 +0530 Subject: [PATCH 3/3] Remove hyphen --- app/views/install/compose.phtml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index f7fa18e3c0..711b46733f 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -727,7 +727,7 @@ services: openruntimes-executor: container_name: openruntimes-executor - hostname: exc-1 + hostname: exc1 <<: *x-logging restart: unless-stopped stop_signal: SIGINT diff --git a/docker-compose.yml b/docker-compose.yml index f933d0a8c2..b3b197381b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -791,7 +791,7 @@ services: openruntimes-executor: container_name: openruntimes-executor - hostname: exc-1 + hostname: exc1 <<: *x-logging stop_signal: SIGINT image: openruntimes/executor:0.5.1 @@ -857,7 +857,7 @@ services: - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG - OPR_PROXY_ALGORITHM=random - - OPR_PROXY_EXECUTORS=exc-1 + - OPR_PROXY_EXECUTORS=exc1 - OPR_PROXY_HEALTHCHECK_INTERVAL=10000 - OPR_PROXY_MAX_TIMEOUT=600 - OPR_PROXY_HEALTHCHECK=enabled