Skip to content

Commit

Permalink
Merge 015169a into 769795e
Browse files Browse the repository at this point in the history
  • Loading branch information
stweiz committed Oct 12, 2016
2 parents 769795e + 015169a commit f6d4c73
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composition/composition_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ func (agg *CompositionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
mergeContext.AddContent(res)

} else if res.Def.Required {
// 404 Error already become logged in logger.go
if res.Content.HttpStatusCode() != 404 {
// 404 and 502 Error already become logged in logger.go
if res.Content.HttpStatusCode() != 404 && res.Content.HttpStatusCode() != 502 {
logging.Application(r.Header).WithField("fetchResult", res).Errorf("error loading content from: %v", res.Def.URL)
}
res.Def.ErrHandler.Handle(res.Err, res.Content.HttpStatusCode(), w, r)
Expand Down

0 comments on commit f6d4c73

Please sign in to comment.