Merge branch 'hotfix-2.9.5'

LukeHandle · LukeHandle · commit 26dfd05045b1 · 2018-02-11T15:53:28.000Z
Resolved issue with cache_memory introduced in 2.9.4
diff --git a/Dockerfile b/Dockerfile
@@ -12,5 +12,5 @@ RUN apk --no-cache add ca-certificates
 COPY --from=builder /go/bin/imgd /imgd
 COPY config.example.gcfg /config.gcfg
 ENTRYPOINT ./imgd
-LABEL Name=imgd Version=2.9.4
+LABEL Name=imgd Version=2.9.5
 EXPOSE 8000
diff --git a/cache_memory.go b/cache_memory.go
@@ -17,7 +17,7 @@ const (
 
 	// Based off those, calculate the maximum number of skins we'll store
 	// in memory.
-	skinCount = skinSize / cacheSize
+	skinCount = cacheSize / skinSize
 )
 
 // Cache object that stores skins in memory.
diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ const (
 	MinWidth     = uint(8)
 	MaxWidth     = uint(300)
 
-	ImgdVersion = "2.9.4"
+	ImgdVersion = "2.9.5"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const (`
`17`	`17`
`18`	`18`	`// Based off those, calculate the maximum number of skins we'll store`
`19`	`19`	`// in memory.`
`20`		`- skinCount = skinSize / cacheSize`
	`20`	`+ skinCount = cacheSize / skinSize`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`// Cache object that stores skins in memory.`