Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-05-11 06:39:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring of error handling

Browse Source
This commit is contained in:
Justin Li
2014-07-25 03:05:43 -04:00
parent 683e90631a
commit 818bef28d7
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
http/routes.go
View File

@@ -23,6 +23,10 @@ func handleError(err error) (int, error) {
return http.StatusOK, nil
} else if _, ok := err.(models.ClientError); ok {
stats.RecordEvent(stats.ClientError)
if _, ok := err.(models.NotFoundError); ok {
return http.StatusNotFound, nil
}
return http.StatusBadRequest, nil
}
return http.StatusInternalServerError, err
@@ -107,10 +111,8 @@ func (s *Server) getTorrent(w http.ResponseWriter, r *http.Request, p httprouter
}
torrent, err := conn.FindTorrent(infohash)
if err == models.ErrTorrentDNE {
return http.StatusNotFound, err
} else if err != nil {
return http.StatusInternalServerError, err
if err != nil {
return handleError(err)
}
w.Header().Set("Content-Type", jsonContentType)
@@ -149,12 +151,7 @@ func (s *Server) delTorrent(w http.ResponseWriter, r *http.Request, p httprouter
return http.StatusNotFound, err
}
err = conn.DeleteTorrent(infohash)
if err == models.ErrTorrentDNE {
return http.StatusNotFound, err
}
return handleError(err)
return handleError(conn.DeleteTorrent(infohash))
}
func (s *Server) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
@@ -201,12 +198,7 @@ func (s *Server) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Pa
return http.StatusInternalServerError, err
}
err = conn.DeleteUser(p.ByName("passkey"))
if err == models.ErrUserDNE {
return http.StatusNotFound, err
}
return handleError(err)
return handleError(conn.DeleteUser(p.ByName("passkey")))
}
func (s *Server) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {