From a50b5071b3f8c554f8e1c3511546d0488110d198 Mon Sep 17 00:00:00 2001 From: iPromKnight <156901906+iPromKnight@users.noreply.github.com> Date: Tue, 26 Mar 2024 11:56:14 +0000 Subject: [PATCH] key prefixes per collector (#172) * Ensure the collectors manage sagas in their own keyspace, as we do not want overlap (they have the same correlation ids internally from the exchange) * version bump --- deployment/docker/components/knightcrawler.yaml | 14 +++++++------- .../Extensions/ServiceCollectionExtensions.cs | 5 ++++- .../Extensions/ServiceCollectionExtensions.cs | 5 ++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/deployment/docker/components/knightcrawler.yaml b/deployment/docker/components/knightcrawler.yaml index 5e4afb3..8a78fb5 100644 --- a/deployment/docker/components/knightcrawler.yaml +++ b/deployment/docker/components/knightcrawler.yaml @@ -20,7 +20,7 @@ x-depends: &knightcrawler-app-depends services: metadata: - image: gabisonfire/knightcrawler-metadata:2.0.5 + image: gabisonfire/knightcrawler-metadata:2.0.6 env_file: ../.env networks: - knightcrawler-network @@ -30,7 +30,7 @@ services: condition: service_completed_successfully migrator: - image: gabisonfire/knightcrawler-migrator:2.0.5 + image: gabisonfire/knightcrawler-migrator:2.0.6 env_file: ../.env networks: - knightcrawler-network @@ -40,7 +40,7 @@ services: condition: service_healthy addon: - image: gabisonfire/knightcrawler-addon:2.0.5 + image: gabisonfire/knightcrawler-addon:2.0.6 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped hostname: knightcrawler-addon @@ -48,22 +48,22 @@ services: - "7000:7000" consumer: - image: gabisonfire/knightcrawler-consumer:2.0.5 + image: gabisonfire/knightcrawler-consumer:2.0.6 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped debridcollector: - image: gabisonfire/knightcrawler-debrid-collector:2.0.5 + image: gabisonfire/knightcrawler-debrid-collector:2.0.6 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped producer: - image: gabisonfire/knightcrawler-producer:2.0.5 + image: gabisonfire/knightcrawler-producer:2.0.6 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped qbitcollector: - image: gabisonfire/knightcrawler-qbit-collector:2.0.5 + image: gabisonfire/knightcrawler-qbit-collector:2.0.6 <<: [*knightcrawler-app, *knightcrawler-app-depends] restart: unless-stopped depends_on: diff --git a/src/debrid-collector/Extensions/ServiceCollectionExtensions.cs b/src/debrid-collector/Extensions/ServiceCollectionExtensions.cs index 4fe0451..0dfb73a 100644 --- a/src/debrid-collector/Extensions/ServiceCollectionExtensions.cs +++ b/src/debrid-collector/Extensions/ServiceCollectionExtensions.cs @@ -62,7 +62,10 @@ public static class ServiceCollectionExtensions cfg.UseMessageRetry(r => r.Intervals(1000,2000,5000)); cfg.UseInMemoryOutbox(); }) - .RedisRepository(redisConfiguration.ConnectionString) + .RedisRepository(redisConfiguration.ConnectionString, options => + { + options.KeyPrefix = "debrid-collector:"; + }) .Endpoint( e => { diff --git a/src/qbit-collector/Extensions/ServiceCollectionExtensions.cs b/src/qbit-collector/Extensions/ServiceCollectionExtensions.cs index 66ae5ac..3f5c347 100644 --- a/src/qbit-collector/Extensions/ServiceCollectionExtensions.cs +++ b/src/qbit-collector/Extensions/ServiceCollectionExtensions.cs @@ -99,7 +99,10 @@ public static class ServiceCollectionExtensions timeout.Timeout = TimeSpan.FromMinutes(1); }); }) - .RedisRepository(redisConfiguration.ConnectionString); + .RedisRepository(redisConfiguration.ConnectionString, options => + { + options.KeyPrefix = "qbit-collector:"; + }); private static void AddQBitTorrentClient(this IServiceCollection services) {