From 2a400a0419b2d787b2ba932155e9ea075a8177f5 Mon Sep 17 00:00:00 2001 From: Justin Li Date: Wed, 23 Jul 2014 01:34:40 -0400 Subject: [PATCH] Handle ErrBadRequest after HandleAnnounce is called --- http/routes.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/http/routes.go b/http/routes.go index b60ef78..5ea0441 100644 --- a/http/routes.go +++ b/http/routes.go @@ -42,19 +42,23 @@ func (s *Server) serveAnnounce(w http.ResponseWriter, r *http.Request, p httprou ann, err := NewAnnounce(s.config, r, p) writer := &Writer{w} - if err == models.ErrMalformedRequest || err == models.ErrBadRequest { + if err == models.ErrMalformedRequest { writer.WriteError(err) return http.StatusOK, nil } else if err != nil { return http.StatusInternalServerError, err } - if err = s.tracker.HandleAnnounce(ann, writer); err != nil { + err = s.tracker.HandleAnnounce(ann, writer) + + if err == models.ErrBadRequest { + writer.WriteError(err) + return http.StatusOK, nil + } else if err != nil { return http.StatusInternalServerError, err } stats.RecordEvent(stats.Announce) - return http.StatusOK, nil }