Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split consumer and producer topic configuration #50

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Split consumer and producer topic configuration #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions adapters/backend/v1/pulsar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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{
Expand Down
3 changes: 2 additions & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
3 changes: 2 additions & 1 deletion config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ func TestLoadConfig(t *testing.T) {
RedeliveryDelaySeconds: 5,
MaxDeliveryAttempts: 20,
},
Topic: "synchronizer",
ProducerTopic: "synchronizer",
ConsumerTopic: "synchronizer",
},
},
},
Expand Down
3 changes: 2 additions & 1 deletion configuration/server/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"backend": {
"subscription": "synchronizer-server",
"topic": "synchronizer",
"producerTopic": "synchronizer",
"consumerTopic": "synchronizer",
"pulsarConfig": {
"url": "pulsar://localhost:6650",
"tenant": "armo",
Expand Down
Loading