Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helper for reading & writing from binary #1600

Merged
merged 8 commits into from
Jun 22, 2016
Merged

Helper for reading & writing from binary #1600

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13269e8
Helper for reading & writing from binary
jml Jun 16, 2016
81b05a3
Make ReadBinary more general and re-use in router
jml Jun 20, 2016
e541734
Review comments
jml Jun 21, 2016
8bd8f88
Restore debugging logic
jml Jun 21, 2016
ce5c933
Remove unused import
jml Jun 21, 2016
23faf58
Drop gob support
jml Jun 21, 2016
40cbf11
Nice error on unsupported content type
jml Jun 22, 2016
9e0b278
Delete test for unsupported functionality
jml Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions report/marshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package report

import (
"compress/gzip"
"encoding/gob"
"io"

log "github.com/Sirupsen/logrus"
Expand Down Expand Up @@ -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
Expand All @@ -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(
Expand Down