github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 10:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop gob support

Browse Source
This commit is contained in:
Jonathan Lange
2016-06-21 11:56:56 +01:00
parent ce5c933d3c
commit 23faf583b3
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
report/marshal.go
View File

@@ -2,7 +2,6 @@ package report
import (
"compress/gzip"
"encoding/gob"
"io"
log "github.com/Sirupsen/logrus"
@@ -36,7 +35,7 @@ func (c byteCounter) Read(p []byte) (n int, err error) {
// ReadBinary reads bytes into a Report.
//
// Will decompress the binary if gzipped is true, and will use the given
// codecHandle to decode it. If codecHandle is nil, will decode as a gob.
// codecHandle to decode it.
func (rep *Report) ReadBinary(r io.Reader, gzipped bool, codecHandle codec.Handle) error {
var err error
var compressedSize, uncompressedSize uint64
@@ -56,13 +55,7 @@ func (rep *Report) ReadBinary(r io.Reader, gzipped bool, codecHandle codec.Handl
if log.GetLevel() == log.DebugLevel {
r = byteCounter{next: r, count: &uncompressedSize}
}
var decoder func(interface{}) error
if codecHandle != nil {
decoder = codec.NewDecoder(r, codecHandle).Decode
} else {
decoder = gob.NewDecoder(r).Decode
}
if err := decoder(&rep); err != nil {
if err := codec.NewDecoder(r, codecHandle).Decode(&rep); err != nil {
return err
}
log.Debugf(