fix(redis): fix redis connection

aldor007 · Apr 21, 2019 · 48117d2 · 48117d2
1 parent d01d44a
commit 48117d2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/cmd/mort/mort.go b/cmd/mort/mort.go
@@ -223,6 +223,7 @@ func main() {
 			obj.Debug = debug
 
 			res := rp.Process(req, obj)
+			defer res.Close()
 			res.SetDebug(obj)
 			if debug {
 				res.Set("X-Mort-Version", Version)

diff --git a/configuration/config.yml b/configuration/config.yml
@@ -1,10 +1,12 @@
 server:
   logLevel: "debug"
   cache:
-      type: "memory"
+      type: "redis"
       address:
         - "localhost:6379"
       maxCacheItemSizeMB: 50
+      clentContg:
+
   listens:
     - ":8080"
     - "unix:/tmp/mort.sock"

diff --git a/pkg/cache/redis.go b/pkg/cache/redis.go
@@ -15,7 +15,7 @@ func parseAddress(addrs []string) map[string]string {
 
 	for _, addr := range addrs {
 		parts := strings.Split(addr, ":")
-		mp[parts[0]] = ":" + parts[1]
+		mp[parts[0]] = parts[0] + ":" + parts[1]
 	}
 
 	return mp

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -251,7 +251,9 @@ func (c *Config) validateServer() error {
 	}
 
 	if c.Server.Cache.MaxCacheItemSize == 0 {
-		c.Server.Cache.MaxCacheItemSize = 50 * 1024
+		c.Server.Cache.MaxCacheItemSize = 50 * 2 << 20
+	} else {
+		c.Server.Cache.MaxCacheItemSize = c.Server.Cache.MaxCacheItemSize * 2 << 20
 	}
 
 	if c.Server.Cache.Type == "" {

diff --git a/pkg/config/types.go b/pkg/config/types.go
@@ -109,11 +109,13 @@ type HeaderYaml struct {
 	Values      map[string]string `yaml:"values"`
 }
 
+// CacheCfg configure type of cache
 type CacheCfg struct {
 	Type             string   `yaml:"type"`
 	Address          []string `yaml:"address"`
 	MaxCacheItemSize int64    `yaml:"maxCacheItemSizeMB"`
 	CacheSize        int64    `yaml:"cacheSize"`
+	ClientConfig     map[string]string `yaml:"clientConfig"`
 }
 
 // Server configure HTTP server

diff --git a/pkg/helpers/helpers.go b/pkg/helpers/helpers.go
@@ -50,7 +50,12 @@ func FetchObject(uri string) ([]byte, error) {
 
 	defer f.Close()
 
-	return ioutil.ReadAll(f)
+	buf, err := ioutil.ReadAll(f)
+	if err != nil {
+		return nil, err
+	}
+
+	return buf, nil
 }
 
 // IsRangeOrCondition check if request is range or condition

diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -166,10 +166,11 @@ func (r *RequestProcessor) process(req *http.Request, obj *object.FileObject) *r
 			res = updateHeaders(obj, r.handleGET(req, obj))
 		}
 
-		if res.IsCachable() && res.IsBuffered() && res.ContentLength < r.serverConfig.Cache.MaxCacheItemSize {
+		if res.IsCachable() && res.ContentLength != -1  && res.ContentLength < r.serverConfig.Cache.MaxCacheItemSize {
 			resCpy, err := res.Copy()
 			if err == nil {
 				go func() {
+					resCpy.ReadBody()
 					err = r.responseCache.Set(obj, resCpy)
 					if err != nil {
 						monitoring.Log().Error("response cache error set", obj.LogData(zap.Error(err))...)
@@ -178,6 +179,7 @@ func (r *RequestProcessor) process(req *http.Request, obj *object.FileObject) *r
 			}
 		}
 
+
 		return res
 	case "PUT":
 		return handlePUT(req, obj)
@@ -300,13 +302,13 @@ func (r *RequestProcessor) handleGET(req *http.Request, obj *object.FileObject)
 				}()
 
 			} else {
-				monitoring.Report().Inc("request_type;type:download")
-
 				if res.StatusCode == 404 {
 					return r.handleNotFound(obj, parentObj, transformsTab, parentRes, res)
 				}
 
-				if res.StatusCode == 200 {
+				monitoring.Report().Inc("request_type;type:download")
+
+				if res.StatusCode > 199 && res.StatusCode < 299 {
 					if obj.CheckParent && parentObj != nil && parentRes.StatusCode == 200 {
 						return res
 					}

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -457,7 +457,9 @@ func prepareResponse(obj *object.FileObject, resData responseData) *response.Res
 		resSize, _ = item.Size()
 	}
 
-	monitoring.Report().Gauge("storage_throughput;method:get,storage:"+obj.Storage.Kind, float64(resSize))
+	if resData.stream != nil {
+		monitoring.Report().Gauge("storage_throughput;method:get,storage:"+obj.Storage.Kind, float64(resSize))
+	}
 
 	if etag != "" {
 		res.Set("ETag", etag)