Fix odd shadowing bug in XL init. (#3874)

Fixes #3873
master
Harshavardhana 8 years ago committed by GitHub
parent 8a9852220d
commit 43317530d5
  1. 6
      Makefile
  2. 6
      cmd/xl-v1.go

@ -71,10 +71,8 @@ verifiers: vet fmt lint cyclo spelling
vet:
@echo "Running $@:"
@go tool vet -all ./cmd
@go tool vet -all ./pkg
@go tool vet -shadow=true ./cmd
@go tool vet -shadow=true ./pkg
@go vet github.com/minio/minio/cmd/...
@go vet github.com/minio/minio/pkg/...
fmt:
@echo "Running $@:"

@ -140,9 +140,9 @@ func newXLObjects(storageDisks []StorageAPI) (ObjectLayer, error) {
// Check if object cache is enabled.
if xl.objCacheEnabled {
// Initialize object cache.
objCache, err := objcache.New(maxCacheSize, objcache.DefaultExpiry)
if err != nil {
return nil, err
objCache, oerr := objcache.New(maxCacheSize, objcache.DefaultExpiry)
if oerr != nil {
return nil, oerr
}
objCache.OnEviction = func(key string) {
debug.FreeOSMemory()

Loading…
Cancel
Save