Merge pull request #29 from rande/fix_static_error

fix(static): fix error management
rande · Dec 5, 2016 · 771f819 · 771f819
2 parents 668aabf + 40a5fd3
commit 771f819
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/mirror/static/static.go b/mirror/static/static.go
@@ -74,16 +74,18 @@ func (gs *StaticService) Serve(state *goapp.GoroutineState) error {
 }
 
 func (gs *StaticService) WriteArchive(w io.Writer, path string) (*StaticFile, error) {
-	logger := gs.Logger.WithFields(log.Fields{
-		"path":   path,
-		"action": "WriteArchive",
-	})
-
 	vaultKey := fmt.Sprintf("%s", path)
 	bucketKey := vaultKey
-
 	url := fmt.Sprintf("%s/%s", gs.Config.SourceServer, path)
 
+	logger := gs.Logger.WithFields(log.Fields{
+		"path":      path,
+		"action":    "WriteArchive",
+		"vaultKey":  vaultKey,
+		"bucketKey": bucketKey,
+		"url":       url,
+	})
+
 	file := &StaticFile{}
 
 	err := gs.DB.View(func(tx *bolt.Tx) error {
@@ -104,7 +106,7 @@ func (gs *StaticService) WriteArchive(w io.Writer, path string) (*StaticFile, er
 
 	if err == pkgmirror.EmptyDataError {
 		file.Url = url
-	} else {
+	} else if err != nil {
 		return nil, err
 	}
 
@@ -163,6 +165,8 @@ func (gs *StaticService) WriteArchive(w io.Writer, path string) (*StaticFile, er
 
 			return nil
 		})
+	} else {
+		logger.Info("Vault entry exist!")
 	}
 
 	logger.Info("Read vault entry")

diff --git a/mirror/static/static_app.go b/mirror/static/static_app.go
@@ -6,11 +6,10 @@
 package static
 
 import (
+	"bytes"
 	"fmt"
 	"net/http"
 
-	"bytes"
-
 	log "github.com/Sirupsen/logrus"
 	"github.com/rande/goapp"
 	"github.com/rande/gonode/core/vault"
@@ -109,6 +108,7 @@ func ConfigureHttp(name string, conf *pkgmirror.StaticConfig, app *goapp.App) {
 
 			pkgmirror.SendWithHttpCode(w, code, err.Error())
 		} else {
+
 			// copy header
 			for name := range file.Header {
 				if name == "Content-Length" {

diff --git a/test/mirror/static_test.go b/test/mirror/static_test.go
@@ -25,7 +25,13 @@ func Test_Static_Get_Valid_File(t *testing.T) {
 		assert.Equal(t, "This is a sample test file.", string(res.GetBody()))
 
 		// get the proxied file
+		res, err = test.RunRequest("GET", fmt.Sprintf("%s/static/static/file.txt", args.TestServer.URL))
+
+		assert.NoError(t, err)
+		assert.Equal(t, 200, res.StatusCode)
+		assert.Equal(t, "This is a sample test file.", string(res.GetBody()))
 
+		// test if the second time the code work fine (using the cache)
 		res, err = test.RunRequest("GET", fmt.Sprintf("%s/static/static/file.txt", args.TestServer.URL))
 
 		assert.NoError(t, err)