From d01d44af66cd4c02ab46c35f3122d3f30d6c3e86 Mon Sep 17 00:00:00 2001 From: Marcin Kaciuba Date: Wed, 3 Apr 2019 17:31:48 +0200 Subject: [PATCH] fix(collapse): fix getting response from cache --- configuration/config.yml | 2 +- pkg/processor/processor.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configuration/config.yml b/configuration/config.yml index 2ceb748..80bd2b0 100644 --- 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 index f10e062..4642ea7 100644 --- 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 }