Set the default Options when none is specified

client.go

@@ -34,6 +34,10 @@ type Client struct {
 
 // NewClient returns a new beanstalk Client object.
 func NewClient(conn net.Conn, options *Options) *Client {
+	if options == nil {
+		options = DefaultOptions()
+	}
+
 	return &Client{
 		options:     options,
 		conn:        conn,

consumer.go

@@ -19,6 +19,10 @@ type Consumer struct {
 
 // NewConsumer returns a new Consumer object.
 func NewConsumer(socket string, tubes []string, jobC chan<- *Job, options *Options) *Consumer {
+	if options == nil {
+		options = DefaultOptions()
+	}
+
 	consumer := &Consumer{
 		tubes: tubes,
 		jobC:  jobC,

producer.go

@@ -13,6 +13,10 @@ type Producer struct {
 
 // NewProducer returns a new Producer object.
 func NewProducer(socket string, putC chan *Put, options *Options) *Producer {
+	if options == nil {
+		options = DefaultOptions()
+	}
+
 	producer := &Producer{
 		putC: putC,
 		stop: make(chan struct{}, 1),

producer_pool.go

@@ -6,15 +6,14 @@ import "sync"
 // incoming Put requests over the maintained Producers.
 type ProducerPool struct {
 	producers []*Producer
-	options   *Options
 	putC      chan *Put
 	putTokens chan *Put
 	sync.Mutex
 }
 
 // NewProducerPool creates a pool of Producer objects.
 func NewProducerPool(sockets []string, options *Options) *ProducerPool {
-	pool := &ProducerPool{putC: make(chan *Put), options: options}
+	pool := &ProducerPool{putC: make(chan *Put)}
 	pool.putTokens = make(chan *Put, len(sockets))
 
 	for _, socket := range sockets {

put.go

@@ -17,6 +17,10 @@ type Put struct {
 // NewPut returns a new Put object that operates on the specified producer
 // channel.
 func NewPut(putC chan<- *Put, options *Options) *Put {
+	if options == nil {
+		options = DefaultOptions()
+	}
+
 	timer := time.NewTimer(time.Second)
 	timer.Stop()