From 3423f2963352e69e46a1b2143a39d05e77b18977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 23 Aug 2021 16:07:49 +0200 Subject: [PATCH] fix!: rename ErrTransport to TransportError --- bolt_transport.go | 8 ++++---- transport.go | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bolt_transport.go b/bolt_transport.go index 900e0a1d..60c3051c 100644 --- a/bolt_transport.go +++ b/bolt_transport.go @@ -51,7 +51,7 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport, if sizeParameter := q.Get("size"); sizeParameter != "" { size, err = strconv.ParseUint(sizeParameter, 10, 64) if err != nil { - return nil, &ErrTransport{u.Redacted(), fmt.Sprintf(`invalid "size" parameter %q`, sizeParameter), err} + return nil, &TransportError{u.Redacted(), fmt.Sprintf(`invalid "size" parameter %q`, sizeParameter), err} } } @@ -60,7 +60,7 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport, if cleanupFrequencyParameter != "" { cleanupFrequency, err = strconv.ParseFloat(cleanupFrequencyParameter, 64) if err != nil { - return nil, &ErrTransport{u.Redacted(), fmt.Sprintf(`invalid "cleanup_frequency" parameter %q`, cleanupFrequencyParameter), err} + return nil, &TransportError{u.Redacted(), fmt.Sprintf(`invalid "cleanup_frequency" parameter %q`, cleanupFrequencyParameter), err} } } @@ -69,12 +69,12 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport, path = u.Host // relative path (bolt://path.db) } if path == "" { - return nil, &ErrTransport{u.Redacted(), "missing path", err} + return nil, &TransportError{u.Redacted(), "missing path", err} } db, err := bolt.Open(path, 0o600, &bolt.Options{Timeout: 1 * time.Second}) if err != nil { - return nil, &ErrTransport{dsn: u.Redacted(), err: err} + return nil, &TransportError{dsn: u.Redacted(), err: err} } return &BoltTransport{ diff --git a/transport.go b/transport.go index fe7469f4..2a2f37a4 100644 --- a/transport.go +++ b/transport.go @@ -30,7 +30,7 @@ func NewTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport, err transportFactoriesMu.RUnlock() if !ok { - return nil, &ErrTransport{dsn: u.Redacted(), msg: "no such transport available"} + return nil, &TransportError{dsn: u.Redacted(), msg: "no such transport available"} } return f(u, l, nil) @@ -57,14 +57,14 @@ type TransportSubscribers interface { // ErrClosedTransport is returned by the Transport's Dispatch and AddSubscriber methods after a call to Close. var ErrClosedTransport = errors.New("hub: read/write on closed Transport") -// ErrTransport is returned when the Transport's DSN is invalid. -type ErrTransport struct { +// TransportError is returned when the Transport's DSN is invalid. +type TransportError struct { dsn string msg string err error } -func (e *ErrTransport) Error() string { +func (e *TransportError) Error() string { if e.msg == "" { if e.err == nil { return fmt.Sprintf("%q: invalid transport", e.dsn) @@ -80,6 +80,6 @@ func (e *ErrTransport) Error() string { return fmt.Sprintf("%q: %s: invalid transport: %s", e.dsn, e.msg, e.err) } -func (e *ErrTransport) Unwrap() error { +func (e *TransportError) Unwrap() error { return e.err }