wip

conn.go

@@ -170,7 +170,12 @@ func (c *Conn) getLogLevel() LogLevel {
 
 // Connect dials and bootstraps the nsqd connection
 // (including IDENTIFY) and returns the IdentifyResponse
-func (c *Conn) Connect(ctx context.Context) (*IdentifyResponse, error) {
+func (c *Conn) Connect() (*IdentifyResponse, error) {
+	ctx := context.Background()
+	return c.ConnectWithContext(ctx)
+}
+
+func (c *Conn) ConnectWithContext(ctx context.Context) (*IdentifyResponse, error) {
 	dialer := &net.Dialer{
 		LocalAddr: c.config.LocalAddr,
 		Timeout:   c.config.DialTimeout,

consumer.go

@@ -2,7 +2,6 @@ package nsq
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"log"
@@ -581,7 +580,7 @@ func (r *Consumer) ConnectToNSQD(addr string) error {
 		conn.Close()
 	}
 
-	resp, err := conn.Connect(context.Background())
+	resp, err := conn.Connect()
 	if err != nil {
 		cleanupConnection()
 		return err

producer.go

@@ -15,7 +15,8 @@ type producerConn interface {
 	SetLogger(logger, LogLevel, string)
 	SetLoggerLevel(LogLevel)
 	SetLoggerForLevel(logger, LogLevel, string)
-	Connect(context.Context) (*IdentifyResponse, error)
+	Connect() (*IdentifyResponse, error)
+	ConnectWithContext(context.Context) (*IdentifyResponse, error)
 	Close() error
 	WriteCommand(*Command) error
 	WriteCommandWithContext(context.Context, *Command) error
@@ -356,7 +357,7 @@ func (w *Producer) connect(ctx context.Context) error {
 		w.conn.SetLoggerForLevel(w.logger[index], LogLevel(index), format)
 	}
 
-	_, err := w.conn.Connect(ctx)
+	_, err := w.conn.ConnectWithContext(ctx)
 	if err != nil {
 		w.conn.Close()
 		w.log(LogLevelError, "(%s) error connecting to nsqd - %s", w.addr, err)

producer_test.go

@@ -374,7 +374,12 @@ func (m *mockProducerConn) SetLoggerLevel(lvl LogLevel) {}
 
 func (m *mockProducerConn) SetLoggerForLevel(logger logger, level LogLevel, format string) {}
 
-func (m *mockProducerConn) Connect(ctx context.Context) (*IdentifyResponse, error) {
+func (m *mockProducerConn) Connect() (*IdentifyResponse, error) {
+	ctx := context.Background()
+	return m.ConnectWithContext(ctx)
+}
+
+func (m *mockProducerConn) ConnectWithContext(ctx context.Context) (*IdentifyResponse, error) {
 	return &IdentifyResponse{}, nil
 }