From 751df3fe630cfd40499c7da18c521fab541fe542 Mon Sep 17 00:00:00 2001 From: wagslane Date: Sat, 21 May 2022 09:01:52 -0600 Subject: [PATCH] lowercase f --- .github/workflows/tests.yml | 13 +++++++------ Makefile | 7 ------- channel.go | 14 +++++++------- consume.go | 16 ++++++++-------- examples/logger/main.go | 12 ++++++------ logger.go | 24 ++++++++++++------------ publish.go | 4 ++-- publish_flow_block.go | 8 ++++---- 8 files changed, 46 insertions(+), 52 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1fe0685..2e00e19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,21 +9,22 @@ jobs: name: Test runs-on: ubuntu-latest env: - GOFLAGS: -mod=vendor - GOPROXY: "off" + GOPROXY: "https://proxy.golang.org,direct" steps: - - name: Set up Go 1.16 + - name: Set up Go 1.18 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 id: go - name: Check out code into the Go module directory uses: actions/checkout@v1 + - name: install staticcheck + run: | + cd /tmp && go install honnef.co/go/tools/cmd/staticcheck@latest + - name: Make tests run: | - make install-lint - make install-staticcheck make diff --git a/Makefile b/Makefile index f8c79c1..e791a83 100644 --- a/Makefile +++ b/Makefile @@ -6,15 +6,8 @@ test: vet: go vet ./... -install-lint: - GO111MODULE=off go get -u golang.org/x/lint/golint - GO111MODULE=off go list -f {{.Target}} golang.org/x/lint/golint - lint: go list ./... | grep -v /vendor/ | xargs -L1 golint -set_exit_status -install-staticcheck: - cd /tmp && GOPROXY="" go get honnef.co/go/tools/cmd/staticcheck - staticcheck: staticcheck ./... diff --git a/channel.go b/channel.go index fb471cd..62122ea 100644 --- a/channel.go +++ b/channel.go @@ -62,18 +62,18 @@ func (chManager *channelManager) startNotifyCancelOrClosed() { select { case err := <-notifyCloseChan: if err != nil { - chManager.logger.ErrorF("attempting to reconnect to amqp server after close with error: %v", err) + chManager.logger.Errorf("attempting to reconnect to amqp server after close with error: %v", err) chManager.reconnectLoop() - chManager.logger.WarnF("successfully reconnected to amqp server") + chManager.logger.Warnf("successfully reconnected to amqp server") chManager.notifyCancelOrClose <- err } if err == nil { - chManager.logger.InfoF("amqp channel closed gracefully") + chManager.logger.Infof("amqp channel closed gracefully") } case err := <-notifyCancelChan: - chManager.logger.ErrorF("attempting to reconnect to amqp server after cancel with error: %s", err) + chManager.logger.Errorf("attempting to reconnect to amqp server after cancel with error: %s", err) chManager.reconnectLoop() - chManager.logger.WarnF("successfully reconnected to amqp server after cancel") + chManager.logger.Warnf("successfully reconnected to amqp server after cancel") chManager.notifyCancelOrClose <- errors.New(err) } } @@ -81,11 +81,11 @@ func (chManager *channelManager) startNotifyCancelOrClosed() { // reconnectLoop continuously attempts to reconnect func (chManager *channelManager) reconnectLoop() { for { - chManager.logger.InfoF("waiting %s seconds to attempt to reconnect to amqp server", chManager.reconnectInterval) + chManager.logger.Infof("waiting %s seconds to attempt to reconnect to amqp server", chManager.reconnectInterval) time.Sleep(chManager.reconnectInterval) err := chManager.reconnect() if err != nil { - chManager.logger.ErrorF("error reconnecting to amqp server: %v", err) + chManager.logger.Errorf("error reconnecting to amqp server: %v", err) } else { chManager.reconnectionCount++ go chManager.startNotifyCancelOrClosed() diff --git a/consume.go b/consume.go index 5346861..ede1e96 100644 --- a/consume.go +++ b/consume.go @@ -112,7 +112,7 @@ func (consumer Consumer) StartConsuming( go func() { for err := range consumer.chManager.notifyCancelOrClose { - consumer.logger.InfoF("successful recovery from: %v", err) + consumer.logger.Infof("successful recovery from: %v", err) err = consumer.startGoroutines( handler, queue, @@ -120,7 +120,7 @@ func (consumer Consumer) StartConsuming( *options, ) if err != nil { - consumer.logger.ErrorF("error restarting consumer goroutines after cancel or close: %v", err) + consumer.logger.Errorf("error restarting consumer goroutines after cancel or close: %v", err) } } }() @@ -130,7 +130,7 @@ func (consumer Consumer) StartConsuming( // Close cleans up resources and closes the consumer. // The consumer is not safe for reuse func (consumer Consumer) Close() error { - consumer.chManager.logger.InfoF("closing consumer...") + consumer.chManager.logger.Infof("closing consumer...") return consumer.chManager.close() } @@ -218,7 +218,7 @@ func (consumer Consumer) startGoroutines( for i := 0; i < consumeOptions.Concurrency; i++ { go handlerGoroutine(consumer, msgs, consumeOptions, handler) } - consumer.logger.InfoF("Processing messages on %v goroutines", consumeOptions.Concurrency) + consumer.logger.Infof("Processing messages on %v goroutines", consumeOptions.Concurrency) return nil } @@ -232,19 +232,19 @@ func handlerGoroutine(consumer Consumer, msgs <-chan amqp.Delivery, consumeOptio case Ack: err := msg.Ack(false) if err != nil { - consumer.logger.ErrorF("can't ack message: %v", err) + consumer.logger.Errorf("can't ack message: %v", err) } case NackDiscard: err := msg.Nack(false, false) if err != nil { - consumer.logger.ErrorF("can't nack message: %v", err) + consumer.logger.Errorf("can't nack message: %v", err) } case NackRequeue: err := msg.Nack(false, true) if err != nil { - consumer.logger.ErrorF("can't nack message: %v", err) + consumer.logger.Errorf("can't nack message: %v", err) } } } - consumer.logger.InfoF("rabbit consumer goroutine closed") + consumer.logger.Infof("rabbit consumer goroutine closed") } diff --git a/examples/logger/main.go b/examples/logger/main.go index e7fca1a..ab23808 100644 --- a/examples/logger/main.go +++ b/examples/logger/main.go @@ -10,24 +10,24 @@ import ( // that only logs ERROR and FATAL log levels type errorLogger struct{} -func (l errorLogger) FatalF(format string, v ...interface{}) { +func (l errorLogger) Fatalf(format string, v ...interface{}) { log.Printf("mylogger: "+format, v...) } -func (l errorLogger) ErrorF(format string, v ...interface{}) { +func (l errorLogger) Errorf(format string, v ...interface{}) { log.Printf("mylogger: "+format, v...) } -func (l errorLogger) WarnF(format string, v ...interface{}) { +func (l errorLogger) Warnf(format string, v ...interface{}) { } -func (l errorLogger) InfoF(format string, v ...interface{}) { +func (l errorLogger) Infof(format string, v ...interface{}) { } -func (l errorLogger) DebugF(format string, v ...interface{}) { +func (l errorLogger) Debugf(format string, v ...interface{}) { } -func (l errorLogger) TraceF(format string, v ...interface{}) {} +func (l errorLogger) Tracef(format string, v ...interface{}) {} func main() { mylogger := &errorLogger{} diff --git a/logger.go b/logger.go index de06a55..fb9ac97 100644 --- a/logger.go +++ b/logger.go @@ -8,12 +8,12 @@ import ( // Logger is the interface to send logs to. It can be set using // WithPublisherOptionsLogger() or WithConsumerOptionsLogger(). type Logger interface { - FatalF(string, ...interface{}) - ErrorF(string, ...interface{}) - WarnF(string, ...interface{}) - InfoF(string, ...interface{}) - DebugF(string, ...interface{}) - TraceF(string, ...interface{}) + Fatalf(string, ...interface{}) + Errorf(string, ...interface{}) + Warnf(string, ...interface{}) + Infof(string, ...interface{}) + Debugf(string, ...interface{}) + Tracef(string, ...interface{}) } const loggingPrefix = "gorabbit" @@ -21,24 +21,24 @@ const loggingPrefix = "gorabbit" // stdDebugLogger logs to stdout up to the `DebugF` level type stdDebugLogger struct{} -func (l stdDebugLogger) FatalF(format string, v ...interface{}) { +func (l stdDebugLogger) Fatalf(format string, v ...interface{}) { log.Printf(fmt.Sprintf("%s FATAL: %s", loggingPrefix, format), v...) } -func (l stdDebugLogger) ErrorF(format string, v ...interface{}) { +func (l stdDebugLogger) Errorf(format string, v ...interface{}) { log.Printf(fmt.Sprintf("%s ERROR: %s", loggingPrefix, format), v...) } -func (l stdDebugLogger) WarnF(format string, v ...interface{}) { +func (l stdDebugLogger) Warnf(format string, v ...interface{}) { log.Printf(fmt.Sprintf("%s WARN: %s", loggingPrefix, format), v...) } -func (l stdDebugLogger) InfoF(format string, v ...interface{}) { +func (l stdDebugLogger) Infof(format string, v ...interface{}) { log.Printf(fmt.Sprintf("%s INFO: %s", loggingPrefix, format), v...) } -func (l stdDebugLogger) DebugF(format string, v ...interface{}) { +func (l stdDebugLogger) Debugf(format string, v ...interface{}) { log.Printf(fmt.Sprintf("%s DEBUG: %s", loggingPrefix, format), v...) } -func (l stdDebugLogger) TraceF(format string, v ...interface{}) {} +func (l stdDebugLogger) Tracef(format string, v ...interface{}) {} diff --git a/publish.go b/publish.go index e10274c..eea644c 100644 --- a/publish.go +++ b/publish.go @@ -122,7 +122,7 @@ func NewPublisher(url string, config Config, optionFuncs ...func(*PublisherOptio func (publisher *Publisher) handleRestarts() { for err := range publisher.chManager.notifyCancelOrClose { - publisher.options.Logger.InfoF("successful publisher recovery from: %v", err) + publisher.options.Logger.Infof("successful publisher recovery from: %v", err) go publisher.startNotifyFlowHandler() go publisher.startNotifyBlockedHandler() if publisher.notifyReturnChan != nil { @@ -210,7 +210,7 @@ func (publisher *Publisher) Publish( // Close closes the publisher and releases resources // The publisher should be discarded as it's not safe for re-use func (publisher Publisher) Close() error { - publisher.chManager.logger.InfoF("closing publisher...") + publisher.chManager.logger.Infof("closing publisher...") return publisher.chManager.close() } diff --git a/publish_flow_block.go b/publish_flow_block.go index 549061b..6e27868 100644 --- a/publish_flow_block.go +++ b/publish_flow_block.go @@ -13,11 +13,11 @@ func (publisher *Publisher) startNotifyFlowHandler() { for ok := range notifyFlowChan { publisher.disablePublishDueToFlowMux.Lock() if ok { - publisher.options.Logger.WarnF("pausing publishing due to flow request from server") + publisher.options.Logger.Warnf("pausing publishing due to flow request from server") publisher.disablePublishDueToFlow = true } else { publisher.disablePublishDueToFlow = false - publisher.options.Logger.WarnF("resuming publishing due to flow request from server") + publisher.options.Logger.Warnf("resuming publishing due to flow request from server") } publisher.disablePublishDueToFlowMux.Unlock() } @@ -32,11 +32,11 @@ func (publisher *Publisher) startNotifyBlockedHandler() { for b := range blockings { publisher.disablePublishDueToBlockedMux.Lock() if b.Active { - publisher.options.Logger.WarnF("pausing publishing due to TCP blocking from server") + publisher.options.Logger.Warnf("pausing publishing due to TCP blocking from server") publisher.disablePublishDueToBlocked = true } else { publisher.disablePublishDueToBlocked = false - publisher.options.Logger.WarnF("resuming publishing due to TCP blocking from server") + publisher.options.Logger.Warnf("resuming publishing due to TCP blocking from server") } publisher.disablePublishDueToBlockedMux.Unlock() }