Rename RequestsBlocked to ClientErrors and remove special cases from tracker code
This commit is contained in:
parent
02f67b4259
commit
b08195aeef
4 changed files with 9 additions and 28 deletions
|
@ -41,7 +41,7 @@ func (s *Server) stats(w http.ResponseWriter, r *http.Request, p httprouter.Para
|
|||
func handleError(err error, w *Writer) (int, error) {
|
||||
if _, ok := err.(*models.ClientError); ok {
|
||||
w.WriteError(err)
|
||||
stats.RecordEvent(stats.BlockedRequest)
|
||||
stats.RecordEvent(stats.ClientError)
|
||||
return http.StatusOK, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -32,8 +32,8 @@ const (
|
|||
ClosedConnection
|
||||
|
||||
HandledRequest
|
||||
BlockedRequest
|
||||
ErroredRequest
|
||||
ClientError
|
||||
|
||||
ResponseTime
|
||||
)
|
||||
|
@ -83,7 +83,7 @@ type Stats struct {
|
|||
|
||||
RequestsHandled uint64 `json:"requests_handled"`
|
||||
RequestsErrored uint64 `json:"requests_errored"`
|
||||
RequestsBlocked uint64 `json:"requests_blocked"`
|
||||
ClientErrors uint64 `json:"client_errors"`
|
||||
|
||||
ResponseTime PercentileTimes `json:"response_time"`
|
||||
MemStats *MemStatsWrapper `json:"mem,omitempty"`
|
||||
|
@ -200,8 +200,8 @@ func (s *Stats) handleEvent(event int) {
|
|||
case HandledRequest:
|
||||
s.RequestsHandled++
|
||||
|
||||
case BlockedRequest:
|
||||
s.RequestsBlocked++
|
||||
case ClientError:
|
||||
s.ClientErrors++
|
||||
|
||||
case ErroredRequest:
|
||||
s.RequestsErrored++
|
||||
|
|
|
@ -22,22 +22,14 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
|
|||
defer conn.Close()
|
||||
|
||||
if tkr.cfg.Whitelist {
|
||||
err = conn.FindClient(ann.ClientID())
|
||||
if err == models.ErrClientUnapproved {
|
||||
w.WriteError(err)
|
||||
return nil
|
||||
} else if err != nil {
|
||||
if err = conn.FindClient(ann.ClientID()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
var user *models.User
|
||||
if tkr.cfg.Private {
|
||||
user, err = conn.FindUser(ann.Passkey)
|
||||
if err == models.ErrUserDNE {
|
||||
w.WriteError(err)
|
||||
return nil
|
||||
} else if err != nil {
|
||||
if user, err = conn.FindUser(ann.Passkey); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -58,10 +50,6 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
|
|||
}
|
||||
stats.RecordEvent(stats.NewTorrent)
|
||||
|
||||
case tkr.cfg.Private && err == models.ErrTorrentDNE:
|
||||
w.WriteError(err)
|
||||
return nil
|
||||
|
||||
case err != nil:
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -17,11 +17,7 @@ func (tkr *Tracker) HandleScrape(scrape *models.Scrape, w Writer) (err error) {
|
|||
defer conn.Close()
|
||||
|
||||
if tkr.cfg.Private {
|
||||
_, err = conn.FindUser(scrape.Passkey)
|
||||
if err == models.ErrUserDNE {
|
||||
w.WriteError(err)
|
||||
return nil
|
||||
} else if err != nil {
|
||||
if _, err = conn.FindUser(scrape.Passkey); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -29,10 +25,7 @@ func (tkr *Tracker) HandleScrape(scrape *models.Scrape, w Writer) (err error) {
|
|||
var torrents []*models.Torrent
|
||||
for _, infohash := range scrape.Infohashes {
|
||||
torrent, err := conn.FindTorrent(infohash)
|
||||
if err == models.ErrTorrentDNE {
|
||||
w.WriteError(err)
|
||||
return nil
|
||||
} else if err != nil {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
torrents = append(torrents, torrent)
|
||||
|
|
Loading…
Add table
Reference in a new issue