Skip to content

Commit

Permalink
fix!: rename ErrTransport to TransportError
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Aug 23, 2021
1 parent f34a447 commit 3423f29
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions bolt_transport.go
Expand Up @@ -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}
}
}

Expand All @@ -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}
}
}

Expand All @@ -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{
Expand Down
10 changes: 5 additions & 5 deletions transport.go
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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
}

0 comments on commit 3423f29

Please sign in to comment.