Skip to content

Commit

Permalink
Merge branch 'release-2.9.1' into develop
Browse files Browse the repository at this point in the history
Configurable logging level (default in config is NOTICE, if not set will default t
  DEBUG will show skin failures
  INFO will log individual requests
  NOTICE will show useful start information and be fairly quiet
Adjust the way stats are reported, add an errored section #159
  Requested is recorded as soon as we establish what is desired (before anything i
  Errors are recorded when we fail to fetch a skin or we have an internal error
Add CORS headers to all responses #167
Handle "MHF_Steve" internally to deprecate "char" #149
  • Loading branch information
LukeHandle committed Oct 10, 2015
2 parents 6af3a9c + f27ef2c commit 604d916
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions http.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ func (router *Router) Serve(resource string) {
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprintf(w, "500 internal server error")
log.Info(r.RemoteAddr + " " + r.RequestURI + " 500 " + skin.Skin.Source)
stats.Errored("InternalServerError")
return
}
router.writeType(vars["extension"], skin, w)
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const (
MinWidth = uint(8)
MaxWidth = uint(300)

ImgdVersion = "2.8"
ImgdVersion = "2.9.1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion status.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type StatusCollector struct {
ImgdMem uint64
// Time in seconds the process has been running for
Uptime int64
// Number of times a request type has been requested.
// Number of times an error has been recorded.
Errored map[string]uint
// Number of times a request type has been requested.
Requested map[string]uint
Expand Down

0 comments on commit 604d916

Please sign in to comment.