From cd5cd473e0a44be96d2e79ce7b6e602a489fb05d Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 15 Oct 2020 12:49:01 +0100 Subject: [PATCH] Rename to naffkaInstance (@Kegsay review comment) --- internal/setup/base.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/setup/base.go b/internal/setup/base.go index d3ce0047a..fba387fae 100644 --- a/internal/setup/base.go +++ b/internal/setup/base.go @@ -351,20 +351,20 @@ func setupKafka(cfg *config.Kafka) (sarama.Consumer, sarama.SyncProducer) { // consuming the same topic from more than one place like we do with Kafka. // Therefore, we will only open one Naffka connection in case Naffka is // running on SQLite. -var naffkaDatabase *naffka.Naffka +var naffkaInstance *naffka.Naffka // setupNaffka creates kafka consumer/producer pair from the config. func setupNaffka(cfg *config.Kafka) (sarama.Consumer, sarama.SyncProducer) { - if naffkaDatabase != nil { - return naffkaDatabase, naffkaDatabase + if naffkaInstance != nil { + return naffkaInstance, naffkaInstance } naffkaDB, err := naffkaStorage.NewDatabase(string(cfg.Database.ConnectionString)) if err != nil { logrus.WithError(err).Panic("Failed to setup naffka database") } - naffkaDatabase, err = naffka.New(naffkaDB) + naffkaInstance, err = naffka.New(naffkaDB) if err != nil { logrus.WithError(err).Panic("Failed to setup naffka") } - return naffkaDatabase, naffkaDatabase + return naffkaInstance, naffkaInstance }