prefetch placeholder

aldor007 · Mar 9, 2018 · 6accc4c · 6accc4c
1 parent 271c5d7
commit 6accc4c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/aldor007/mort/pkg/helpers"
 	"github.com/aldor007/mort/pkg/monitoring"
 )
 
@@ -241,6 +242,14 @@ func (c *Config) validateServer() error {
 		c.Server.QueueLen = 5
 	}
 
+	if c.Server.Placeholder != "" {
+		var err error
+		c.Server.PlaceholderBuf, err = helpers.FetchObject(c.Server.Placeholder)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

diff --git a/pkg/config/types.go b/pkg/config/types.go
@@ -112,4 +112,5 @@ type Server struct {
 	Listen         []string `yaml:"listens"`
 	Monitoring     string   `yaml:"monitoring"`
 	Placeholder    string   `yaml:"placeholder"`
+	PlaceholderBuf []byte
 }
diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/aldor007/mort/pkg/config"
 	"github.com/aldor007/mort/pkg/engine"
-	"github.com/aldor007/mort/pkg/helpers"
 	"github.com/aldor007/mort/pkg/lock"
 	"github.com/aldor007/mort/pkg/monitoring"
 	"github.com/aldor007/mort/pkg/object"
@@ -96,17 +95,13 @@ func (r *RequestProcessor) replyWithError(obj *object.FileObject, sc int, err er
 		return response.NewError(sc, err)
 	}
 
-	key := r.serverConfig.Placeholder + strconv.FormatUint(obj.Transforms.Hash().Sum64(), 16) + strconv.FormatInt(int64(sc), 10)
+	key := r.serverConfig.Placeholder + strconv.FormatUint(obj.Transforms.Hash().Sum64(), 16)
 	if cacheRes := r.fetchResponseFromCache(key); cacheRes != nil {
+		cacheRes.StatusCode = sc
 		return cacheRes
 	}
 
-	buf, err := helpers.FetchObject(r.serverConfig.Placeholder)
-	if err != nil {
-		return response.NewError(sc, err)
-	}
-
-	parent := response.NewBuf(sc, buf)
+	parent := response.NewBuf(sc, r.serverConfig.PlaceholderBuf)
 	transformsTab := []transforms.Transforms{obj.Transforms}
 
 	eng := engine.NewImageEngine(parent)

diff --git a/pkg/response/response_test.go b/pkg/response/response_test.go
@@ -3,13 +3,13 @@ package response
 import (
 	"bytes"
 	"errors"
+	"github.com/aldor007/mort/pkg/object"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"github.com/aldor007/mort/pkg/object"
 )
 
 func TestResponse_Copy(t *testing.T) {