fix(collapse): fix getting response from cache

aldor007 · Apr 21, 2019 · d01d44a · d01d44a
1 parent 729b62d
commit d01d44a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/configuration/config.yml b/configuration/config.yml
@@ -94,7 +94,7 @@ buckets:
                 headers:
                   "x--key": "sec"
             transform:
-                kind: "local-meta"
+                kind: "noop"
                 rootPath: "/tmp/mort"
                 pathPrefix: "transforms"
 

diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -162,9 +162,10 @@ func (r *RequestProcessor) process(req *http.Request, obj *object.FileObject) *r
 
 		if obj.HasTransform() {
 			res = updateHeaders(obj, r.collapseGET(req, obj))
+		} else {
+			res = updateHeaders(obj, r.handleGET(req, obj))
 		}
 
-		res = updateHeaders(obj, r.handleGET(req, obj))
 		if res.IsCachable() && res.IsBuffered() && res.ContentLength < r.serverConfig.Cache.MaxCacheItemSize {
 			resCpy, err := res.Copy()
 			if err == nil {
@@ -224,7 +225,7 @@ func (r *RequestProcessor) collapseGET(req *http.Request, obj *object.FileObject
 			lockResult.Cancel <- true
 			return r.replyWithError(obj, 504, errTimeout)
 		default:
-			if cacheRes, err := r.responseCache.Get(obj); err != nil {
+			if cacheRes, err := r.responseCache.Get(obj); err == nil {
 				lockResult.Cancel <- true
 				return cacheRes
 			}