Move compression settings to UDPWriter and run go fmt

ghislainbourgeois · ghislainbourgeois · commit e98b8fb6eb6f · 2017-07-03T22:07:20.000-04:00
diff --git a/gelf/tcpwriter.go b/gelf/tcpwriter.go
@@ -9,21 +9,20 @@ import (
 )
 
 const (
-	DefaultMaxReconnect = 3
+	DefaultMaxReconnect   = 3
 	DefaultReconnectDelay = 1
 )
 
 type TCPWriter struct {
 	GelfWriter
-	mu           sync.Mutex
-	MaxReconnect int
+	mu             sync.Mutex
+	MaxReconnect   int
 	ReconnectDelay time.Duration
 }
 
 func NewTCPWriter(addr string) (*TCPWriter, error) {
 	var err error
 	w := new(TCPWriter)
-	w.CompressionType = CompressNone
 	w.MaxReconnect = DefaultMaxReconnect
 	w.ReconnectDelay = DefaultReconnectDelay
 	w.proto = "tcp"
diff --git a/gelf/udpwriter.go b/gelf/udpwriter.go
@@ -20,6 +20,8 @@ import (
 
 type UDPWriter struct {
 	GelfWriter
+	CompressionLevel int // one of the consts from compress/flate
+	CompressionType  CompressType
 }
 
 // What compression type the writer should use when sending messages
diff --git a/gelf/writer.go b/gelf/writer.go
@@ -18,13 +18,11 @@ type Writer interface {
 // messages to a graylog2 server, or data from a stream-oriented
 // interface (like the functions in log).
 type GelfWriter struct {
-	addr             string
-	conn             net.Conn
-	hostname         string
-	Facility         string // defaults to current process name
-	proto            string
-	CompressionLevel int // one of the consts from compress/flate
-	CompressionType  CompressType
+	addr     string
+	conn     net.Conn
+	hostname string
+	Facility string // defaults to current process name
+	proto    string
 }
 
 // Close connection and interrupt blocked Read or Write operations

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ import (`
`20`	`20`
`21`	`21`	`type UDPWriter struct {`
`22`	`22`	`GelfWriter`
	`23`	`+ CompressionLevel int // one of the consts from compress/flate`
	`24`	`+ CompressionType CompressType`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`// What compression type the writer should use when sending messages`