diff --git a/adapters/backend/v1/pulsar.go b/adapters/backend/v1/pulsar.go index caf9fd9..2793ac7 100644 --- a/adapters/backend/v1/pulsar.go +++ b/adapters/backend/v1/pulsar.go @@ -45,7 +45,7 @@ func NewPulsarMessageReader(cfg config.Config, pulsarClient pulsarconnector.Clie panic(err) } readerName := fmt.Sprintf("%s-%s", cfg.Backend.Subscription, hostname) - topic := pulsarconnector.BuildPersistentTopic(pulsarClient.GetConfig().Tenant, pulsarClient.GetConfig().Namespace, cfg.Backend.Topic) + topic := pulsarconnector.BuildPersistentTopic(pulsarClient.GetConfig().Tenant, pulsarClient.GetConfig().Namespace, cfg.Backend.ConsumerTopic) logger.L().Debug("creating new pulsar reader", helpers.String("readerName", readerName), helpers.String("topic", topic)) @@ -333,7 +333,7 @@ type PulsarMessageProducer struct { } func NewPulsarMessageProducer(cfg config.Config, pulsarClient pulsarconnector.Client) (*PulsarMessageProducer, error) { - topic := cfg.Backend.Topic + topic := cfg.Backend.ProducerTopic fullTopic := pulsarconnector.BuildPersistentTopic(pulsarClient.GetConfig().Tenant, pulsarClient.GetConfig().Namespace, topic) options := pulsar.ProducerOptions{ diff --git a/config/config.go b/config/config.go index dce117d..2388d94 100644 --- a/config/config.go +++ b/config/config.go @@ -25,7 +25,8 @@ type Backend struct { AuthenticationServer *AuthenticationServerConfig `mapstructure:"authenticationServer"` Subscription string `mapstructure:"subscription"` PulsarConfig *pulsarconfig.PulsarConfig `mapstructure:"pulsarConfig"` - Topic pulsarconnector.TopicName `mapstructure:"topic"` + ProducerTopic pulsarconnector.TopicName `mapstructure:"producerTopic"` + ConsumerTopic pulsarconnector.TopicName `mapstructure:"consumerTopic"` Prometheus *PrometheusConfig `mapstructure:"prometheusConfig"` } diff --git a/config/config_test.go b/config/config_test.go index afb25d8..dd4fb5a 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -93,7 +93,8 @@ func TestLoadConfig(t *testing.T) { RedeliveryDelaySeconds: 5, MaxDeliveryAttempts: 20, }, - Topic: "synchronizer", + ProducerTopic: "synchronizer", + ConsumerTopic: "synchronizer", }, }, }, diff --git a/configuration/server/config.json b/configuration/server/config.json index e242dd7..d9a453a 100644 --- a/configuration/server/config.json +++ b/configuration/server/config.json @@ -1,7 +1,8 @@ { "backend": { "subscription": "synchronizer-server", - "topic": "synchronizer", + "producerTopic": "synchronizer", + "consumerTopic": "synchronizer", "pulsarConfig": { "url": "pulsar://localhost:6650", "tenant": "armo",