ClientError base type struct -> string

This commit is contained in:
Jimmy Zelinskie 2014-07-24 19:34:17 -04:00
parent b08195aeef
commit 788b349dd7
2 changed files with 10 additions and 14 deletions

View file

@ -39,7 +39,7 @@ func (s *Server) stats(w http.ResponseWriter, r *http.Request, p httprouter.Para
} }
func handleError(err error, w *Writer) (int, error) { func handleError(err error, w *Writer) (int, error) {
if _, ok := err.(*models.ClientError); ok { if _, ok := err.(models.ClientError); ok {
w.WriteError(err) w.WriteError(err)
stats.RecordEvent(stats.ClientError) stats.RecordEvent(stats.ClientError)
return http.StatusOK, nil return http.StatusOK, nil

View file

@ -11,36 +11,32 @@ import (
"github.com/chihaya/chihaya/config" "github.com/chihaya/chihaya/config"
) )
type ClientError struct {
message string
}
var ( var (
// ErrMalformedRequest is returned when a request does not contain the // ErrMalformedRequest is returned when a request does not contain the
// required parameters needed to create a model. // required parameters needed to create a model.
ErrMalformedRequest = &ClientError{"malformed request"} ErrMalformedRequest = ClientError("malformed request")
// ErrBadRequest is returned when a request is invalid in the peer's // ErrBadRequest is returned when a request is invalid in the peer's
// current state. For example, announcing a "completed" event while // current state. For example, announcing a "completed" event while
// not a leecher or a "stopped" event while not active. // not a leecher or a "stopped" event while not active.
ErrBadRequest = &ClientError{"bad request"} ErrBadRequest = ClientError("bad request")
// ErrUserDNE is returned when a user does not exist. // ErrUserDNE is returned when a user does not exist.
ErrUserDNE = &ClientError{"user does not exist"} ErrUserDNE = ClientError("user does not exist")
// ErrTorrentDNE is returned when a torrent does not exist. // ErrTorrentDNE is returned when a torrent does not exist.
ErrTorrentDNE = &ClientError{"torrent does not exist"} ErrTorrentDNE = ClientError("torrent does not exist")
// ErrClientUnapproved is returned when a clientID is not in the whitelist. // ErrClientUnapproved is returned when a clientID is not in the whitelist.
ErrClientUnapproved = &ClientError{"client is not approved"} ErrClientUnapproved = ClientError("client is not approved")
// ErrInvalidPasskey is returned when a passkey is not properly formatted. // ErrInvalidPasskey is returned when a passkey is not properly formatted.
ErrInvalidPasskey = &ClientError{"passkey is invalid"} ErrInvalidPasskey = ClientError("passkey is invalid")
) )
func (e *ClientError) Error() string { type ClientError string
return e.message
} func (c ClientError) Error() string { return string(c) }
// Peer is a participant in a swarm. // Peer is a participant in a swarm.
type Peer struct { type Peer struct {