Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.9.1 #170

Merged
merged 4 commits into from
Oct 10, 2015
Merged

Release 2.9.1 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6af3a9c
Merge branch 'feature-cors' into develop
LukeHandle Oct 10, 2015
aa33686
Bump version number
LukeHandle Oct 10, 2015
3a26ff2
Typo in comment regarding status error
LukeHandle Oct 10, 2015
f27ef2c
Record stats for InternalServerError
LukeHandle Oct 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions http.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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