5d20cf8829
* peertls: don't log errors for double close understood that this part of the code is undergoing heavy change right now, but just want to make sure this fix gets incorporated somewhere * git cleanup: node-id stuff * cleanup * rename identity_util.go * wip `CertificateAuthority` refactor * refactoring * gitignore update * wip * Merge remote-tracking branch 'storj/doubleclose' into node-id3 * storj/doubleclose: peertls: don't log errors for double close * add peertls tests & gomports * wip: + refactor + style changes + cleanup + [wip] add version to CA and identity configs + [wip] heavy client setup * refactor * wip: + refactor + style changes + add `CAConfig.Load` + add `CAConfig.Save` * wip: + add `LoadOrCreate` and `Create` to CA and Identity configs + add overwrite to CA and identity configs + heavy client setup + refactor + style changes + cleanup * wip * fixing things * fixing things * wip hc setup * hc setup: + refactor + bugfixing * improvements based on reveiw feedback * goimports * improvements: + responding to review feedback + refactor * feedback-based improvements * feedback-based improvements * feedback-based improvements * feedback-based improvements * feedback-based improvements * feedback-based improvements * cleanup * refactoring CA and Identity structs * Merge branch 'master' into node-id3 * move version field to setup config structs for CA and identity * fix typo * responding to revieiw feedback * responding to revieiw feedback * responding to revieiw feedback * responding to revieiw feedback * responding to revieiw feedback * responding to revieiw feedback * Merge branch 'master' into node-id3 * fix gateway setup finally * go imports * fix `FullCertificateAuthority.GenerateIdentity` * cleanup overlay tests * bugfixing * update ca/identity setup * go imports * fix peertls test copy/paste fail * responding to review feedback * setup tweaking * update farmer setup
51 lines
1005 B
Go
51 lines
1005 B
Go
// Copyright (C) 2018 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package utils
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// ReaderSource takes a src func and turns it into an io.Reader
|
|
type ReaderSource struct {
|
|
src func() ([]byte, error)
|
|
buf []byte
|
|
err error
|
|
}
|
|
|
|
// NewReaderSource makes a new ReaderSource
|
|
func NewReaderSource(src func() ([]byte, error)) *ReaderSource {
|
|
return &ReaderSource{src: src}
|
|
}
|
|
|
|
// Read implements io.Reader
|
|
func (rs *ReaderSource) Read(p []byte) (n int, err error) {
|
|
if rs.err != nil {
|
|
return 0, rs.err
|
|
}
|
|
if len(rs.buf) == 0 {
|
|
rs.buf, rs.err = rs.src()
|
|
}
|
|
|
|
n = copy(p, rs.buf)
|
|
rs.buf = rs.buf[n:]
|
|
return n, rs.err
|
|
}
|
|
|
|
// LogClose closes an io.Closer, logging the error if there is one that isn't
|
|
// os.ErrClosed
|
|
func LogClose(fh io.Closer) {
|
|
err := fh.Close()
|
|
if err == nil || err == os.ErrClosed {
|
|
return
|
|
}
|
|
if perr, ok := err.(*os.PathError); ok && perr.Err == os.ErrClosed {
|
|
return
|
|
}
|
|
zap.S().Errorf("Failed to close file: %s", err)
|
|
}
|