浏览代码

Improve config error formatting

(get rid of spurious capitals)
Evan Huus 10 年之前
父节点
当前提交
b83b8aea94
共有 2 个文件被更改,包括 26 次插入26 次删除
  1. 25 25
      config.go
  2. 1 1
      errors.go

+ 25 - 25
config.go

@@ -183,71 +183,71 @@ func (c *Config) Validate() error {
 	// validate Net values
 	switch {
 	case c.Net.MaxOpenRequests <= 0:
-		return ConfigurationError("Invalid Net.MaxOpenRequests, must be > 0")
+		return ConfigurationError("Net.MaxOpenRequests must be > 0")
 	case c.Net.DialTimeout <= 0:
-		return ConfigurationError("Invalid Net.DialTimeout, must be > 0")
+		return ConfigurationError("Net.DialTimeout must be > 0")
 	case c.Net.ReadTimeout <= 0:
-		return ConfigurationError("Invalid Net.ReadTimeout, must be > 0")
+		return ConfigurationError("Net.ReadTimeout must be > 0")
 	case c.Net.WriteTimeout <= 0:
-		return ConfigurationError("Invalid Net.WriteTimeout, must be > 0")
+		return ConfigurationError("Net.WriteTimeout must be > 0")
 	case c.Net.KeepAlive < 0:
-		return ConfigurationError("Invalid Net.KeepAlive, must be >= 0")
+		return ConfigurationError("Net.KeepAlive must be >= 0")
 	}
 
 	// validate the Metadata values
 	switch {
 	case c.Metadata.Retry.Max < 0:
-		return ConfigurationError("Invalid Metadata.Retry.Max, must be >= 0")
+		return ConfigurationError("Metadata.Retry.Max must be >= 0")
 	case c.Metadata.Retry.Backoff < 0:
-		return ConfigurationError("Invalid Metadata.Retry.Backoff, must be >= 0")
+		return ConfigurationError("Metadata.Retry.Backoff must be >= 0")
 	case c.Metadata.RefreshFrequency < 0:
-		return ConfigurationError("Invalid Metadata.RefreshFrequency, must be >= 0")
+		return ConfigurationError("Metadata.RefreshFrequency must be >= 0")
 	}
 
 	// validate the Producer values
 	switch {
 	case c.Producer.MaxMessageBytes <= 0:
-		return ConfigurationError("Invalid Producer.MaxMessageBytes, must be > 0")
+		return ConfigurationError("Producer.MaxMessageBytes must be > 0")
 	case c.Producer.RequiredAcks < -1:
-		return ConfigurationError("Invalid Producer.RequiredAcks, must be >= -1")
+		return ConfigurationError("Producer.RequiredAcks must be >= -1")
 	case c.Producer.Timeout <= 0:
-		return ConfigurationError("Invalid Producer.Timeout, must be > 0")
+		return ConfigurationError("Producer.Timeout must be > 0")
 	case c.Producer.Partitioner == nil:
-		return ConfigurationError("Invalid Producer.Partitioner, must not be nil")
+		return ConfigurationError("Producer.Partitioner must not be nil")
 	case c.Producer.Flush.Bytes < 0:
-		return ConfigurationError("Invalid Producer.Flush.Bytes, must be >= 0")
+		return ConfigurationError("Producer.Flush.Bytes must be >= 0")
 	case c.Producer.Flush.Messages < 0:
-		return ConfigurationError("Invalid Producer.Flush.Messages, must be >= 0")
+		return ConfigurationError("Producer.Flush.Messages must be >= 0")
 	case c.Producer.Flush.Frequency < 0:
-		return ConfigurationError("Invalid Producer.Flush.Frequency, must be >= 0")
+		return ConfigurationError("Producer.Flush.Frequency must be >= 0")
 	case c.Producer.Flush.MaxMessages < 0:
-		return ConfigurationError("Invalid Producer.Flush.MaxMessages, must be >= 0")
+		return ConfigurationError("Producer.Flush.MaxMessages must be >= 0")
 	case c.Producer.Flush.MaxMessages > 0 && c.Producer.Flush.MaxMessages < c.Producer.Flush.Messages:
-		return ConfigurationError("Invalid Producer.Flush.MaxMessages, must be >= Producer.Flush.Messages when set")
+		return ConfigurationError("Producer.Flush.MaxMessages must be >= Producer.Flush.Messages when set")
 	case c.Producer.Retry.Max < 0:
-		return ConfigurationError("Invalid Producer.Retry.Max, must be >= 0")
+		return ConfigurationError("Producer.Retry.Max must be >= 0")
 	case c.Producer.Retry.Backoff < 0:
-		return ConfigurationError("Invalid Producer.Retry.Backoff, must be >= 0")
+		return ConfigurationError("Producer.Retry.Backoff must be >= 0")
 	}
 
 	// validate the Consumer values
 	switch {
 	case c.Consumer.Fetch.Min <= 0:
-		return ConfigurationError("Invalid Consumer.Fetch.Min, must be > 0")
+		return ConfigurationError("Consumer.Fetch.Min must be > 0")
 	case c.Consumer.Fetch.Default <= 0:
-		return ConfigurationError("Invalid Consumer.Fetch.Default, must be > 0")
+		return ConfigurationError("Consumer.Fetch.Default must be > 0")
 	case c.Consumer.Fetch.Max < 0:
-		return ConfigurationError("Invalid Consumer.Fetch.Max, must be >= 0")
+		return ConfigurationError("Consumer.Fetch.Max must be >= 0")
 	case c.Consumer.MaxWaitTime < 1*time.Millisecond:
-		return ConfigurationError("Invalid Consumer.MaxWaitTime, must be > 1ms")
+		return ConfigurationError("Consumer.MaxWaitTime must be > 1ms")
 	case c.Consumer.Retry.Backoff < 0:
-		return ConfigurationError("Invalid Consumer.Retry.Backoff, must be >= 0")
+		return ConfigurationError("Consumer.Retry.Backoff must be >= 0")
 	}
 
 	// validate misc shared values
 	switch {
 	case c.ChannelBufferSize < 0:
-		return ConfigurationError("Invalid ChannelBufferSize, must be >= 0")
+		return ConfigurationError("ChannelBufferSize must be >= 0")
 	}
 
 	return nil

+ 1 - 1
errors.go

@@ -62,7 +62,7 @@ func (err PacketDecodingError) Error() string {
 type ConfigurationError string
 
 func (err ConfigurationError) Error() string {
-	return "kafka: Invalid Configuration: " + string(err)
+	return "kafka: invalid configuration (" + string(err) + ")"
 }
 
 // KError is the type of error that can be returned directly by the Kafka broker.