Merge pull request #3 from dqminh/fix-gelf-uncompressed

Fix gelf uncompressed scheme

Author: Marius Sturm

gelf/reader.go

@@ -66,7 +66,6 @@ func (r *Reader) ReadMessage() (*Message, error) {
 	var (
 		err        error
 		n, length  int
-		buf        bytes.Buffer
 		cid, ocid  []byte
 		seq, total uint8
 		cHead      []byte
@@ -122,19 +121,18 @@ func (r *Reader) ReadMessage() (*Message, error) {
 		// zlib is slightly more complicated, but correct
 		cReader, err = zlib.NewReader(bytes.NewReader(cBuf))
 	} else {
-		return nil, fmt.Errorf("unknown magic: %x %v", cHead, cHead)
+		// compliance with https://github.com/Graylog2/graylog2-server
+		// treating all messages as uncompressed if  they are not gzip, zlib or
+		// chunked
+		cReader = bytes.NewReader(cBuf)
 	}
 
 	if err != nil {
 		return nil, fmt.Errorf("NewReader: %s", err)
 	}
 
-	if _, err = io.Copy(&buf, cReader); err != nil {
-		return nil, fmt.Errorf("io.Copy: %s", err)
-	}
-
 	msg := new(Message)
-	if err := json.Unmarshal(buf.Bytes(), &msg); err != nil {
+	if err := json.NewDecoder(cReader).Decode(&msg); err != nil {
 		return nil, fmt.Errorf("json.Unmarshal: %s", err)
 	}
 

gelf/writer.go

@@ -199,13 +199,6 @@ func newBuffer() *bytes.Buffer {
 func (w *Writer) WriteMessage(m *Message) (err error) {
 	mBuf := newBuffer()
 	defer bufPool.Put(mBuf)
-	// when compression is disabled, prewrite the magic byte before encoding
-	// so we dont have to re-copy the slice after
-	if w.CompressionType == CompressNone {
-		if _, err = mBuf.Write([]byte{0x1f, 0x3c}); err != nil {
-			return err
-		}
-	}
 	if err = m.MarshalJSONBuf(mBuf); err != nil {
 		return err
 	}

gelf/writer_test.go

@@ -66,7 +66,7 @@ func sendAndRecvMsg(msg *Message, compress CompressType) (*Message, error) {
 // tests single-message (non-chunked) messages that are split over
 // multiple lines
 func TestWriteSmallMultiLine(t *testing.T) {
-	for _, i := range []CompressType{CompressGzip, CompressZlib} {
+	for _, i := range []CompressType{CompressGzip, CompressZlib, CompressNone} {
 		msgData := "awesomesauce\nbananas"
 
 		msg, err := sendAndRecv(msgData, i)