diff --git a/.env b/.env index 7659ea7..c5f09f7 100644 --- a/.env +++ b/.env @@ -56,7 +56,8 @@ MESSENGER_CONSUMER_NAME=worker # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages MESSENGER_ASYNC_TRANSPORT_DSN=redis://localhost:6379/messages?lazy=1 -MESSENGER_RDAP_ASYNC_TRANSPORT_DSN=redis://localhost:6379/messages-rdap?lazy=1 +MESSENGER_RDAP_LOW_TRANSPORT_DSN=redis://localhost:6379/messages-rdap-low?lazy=1 +MESSENGER_RDAP_HIGH_TRANSPORT_DSN=redis://localhost:6379/messages-rdap-high?lazy=1 ###< symfony/messenger ### diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml index a4843b2..74a3a53 100644 --- a/config/packages/messenger.yaml +++ b/config/packages/messenger.yaml @@ -10,7 +10,7 @@ framework: max_retries: 3 multiplier: 2 rdap_high: - dsn: '%env(MESSENGER_RDAP_ASYNC_TRANSPORT_DSN)%' + dsn: '%env(MESSENGER_RDAP_HIGH_TRANSPORT_DSN)%' options: consumer: '%env(MESSENGER_CONSUMER_NAME)%' retry_strategy: @@ -19,7 +19,7 @@ framework: max_delay: 86400000 rdap_low: - dsn: '%env(MESSENGER_RDAP_ASYNC_TRANSPORT_DSN)%' + dsn: '%env(MESSENGER_RDAP_LOW_TRANSPORT_DSN)%' options: consumer: '%env(MESSENGER_CONSUMER_NAME)%' retry_strategy: diff --git a/docker-compose.yml b/docker-compose.yml index 32ef3b7..8c56298 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,8 @@ services: SERVER_NAME: ${SERVER_NAME:-:80} DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8} MESSENGER_ASYNC_TRANSPORT_DSN: redis://valkey:6379/messages - MESSENGER_RDAP_ASYNC_TRANSPORT_DSN: redis://valkey:6379/messages-rdap + MESSENGER_RDAP_LOW_TRANSPORT_DSN: redis://valkey:6379/messages-rdap-low + MESSENGER_RDAP_HIGH_TRANSPORT_DSN: redis://valkey:6379/messages-rdap-high volumes: - caddy_data:/data - caddy_config:/config @@ -33,7 +34,8 @@ services: APP_ENV: prod DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8} MESSENGER_ASYNC_TRANSPORT_DSN: redis://valkey:6379/messages - MESSENGER_RDAP_ASYNC_TRANSPORT_DSN: redis://valkey:6379/messages-rdap + MESSENGER_RDAP_LOW_TRANSPORT_DSN: redis://valkey:6379/messages-rdap-low + MESSENGER_RDAP_HIGH_TRANSPORT_DSN: redis://valkey:6379/messages-rdap-high MESSENGER_CONSUMER_NAME: worker depends_on: - database diff --git a/src/MessageHandler/UpdateDomainHandler.php b/src/MessageHandler/UpdateDomainHandler.php index 232c3c2..66924dd 100644 --- a/src/MessageHandler/UpdateDomainHandler.php +++ b/src/MessageHandler/UpdateDomainHandler.php @@ -24,6 +24,7 @@ use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Messenger\Attribute\AsMessageHandler; use Symfony\Component\Messenger\Exception\ExceptionInterface; use Symfony\Component\Messenger\MessageBusInterface; +use Symfony\Component\Messenger\Stamp\TransportNamesStamp; use Symfony\Component\Mime\Address; use Symfony\Component\Notifier\Recipient\Recipient; use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface; @@ -89,7 +90,9 @@ final readonly class UpdateDomainHandler if (null === $watchlist) { /** @var Watchlist $wl */ foreach ($domain->getWatchlists()->getIterator() as $wl) { - $this->bus->dispatch(new UpdateDomain($message->ldhName, $wl->getToken())); + $this->bus->dispatch(new UpdateDomain($message->ldhName, $wl->getToken()), [ + new TransportNamesStamp('rdap_low'), + ]); } return;