handle special case when browser also asks for favicon.ico

git-svn-id: https://weed-fs.googlecode.com/svn/trunk@53 282b0af5-e82d-9cf1-ede4-77906d7719d0

2 files changed, 17 insertions, 13 deletions

diff --git a/weed-fs/src/cmd/weedvolume/weedvolume.go b/weed-fs/src/cmd/weedvolume/weedvolume.go
index e31b5cd0c..9d609d8ae 100644
--- a/weed-fs/src/cmd/weedvolume/weedvolume.go
+++ b/weed-fs/src/cmd/weedvolume/weedvolume.go
@@ -72,15 +72,15 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
 	if e != nil {
 		writeJson(w, r, e)
 	} else {
-	  needle, ne := storage.NewNeedle(r)
-	  if ne!=nil{
-	    writeJson(w, r, ne)
-	  }else{
-	    ret := store.Write(volumeId, needle)
-	    m := make(map[string]uint32)
-	    m["size"] = ret
-	    writeJson(w, r, m)
-	  }
+		needle, ne := storage.NewNeedle(r)
+		if ne != nil {
+			writeJson(w, r, ne)
+		} else {
+			ret := store.Write(volumeId, needle)
+			m := make(map[string]uint32)
+			m["size"] = ret
+			writeJson(w, r, m)
+		}
 	}
 }
 func DeleteHandler(w http.ResponseWriter, r *http.Request) {
@@ -132,7 +132,9 @@ func parseURLPath(path string) (vid, fid, ext string) {
 	sepIndex := strings.LastIndex(path, "/")
 	commaIndex := strings.LastIndex(path[sepIndex:], ",")
 	if commaIndex <= 0 {
-		log.Println("unknown file id", path[sepIndex+1:])
+		if "favicon.ico" != path[sepIndex+1:] {
+			log.Println("unknown file id", path[sepIndex+1:])
+		}
 		return
 	}
 	dotIndex := strings.LastIndex(path[sepIndex:], ".")
@@ -158,7 +160,7 @@ func main() {
 	go func() {
 		for {
 			store.Join(*metaServer)
-			time.Sleep(time.Duration(float32(*pulse * 1e3) *(1 + rand.Float32()))*time.Millisecond)
+			time.Sleep(time.Duration(float32(*pulse*1e3)*(1+rand.Float32())) * time.Millisecond)
 		}
 	}()
 	log.Println("store joined at", *metaServer)
diff --git a/weed-fs/src/pkg/storage/needle.go b/weed-fs/src/pkg/storage/needle.go
index b9d2a1300..a7ae80857 100644
--- a/weed-fs/src/pkg/storage/needle.go
+++ b/weed-fs/src/pkg/storage/needle.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"pkg/util"
 	"strings"
-  "pkg/util"
 )
 
 type Needle struct {
@@ -47,7 +47,9 @@ func NewNeedle(r *http.Request) (n *Needle, e error) {
 func (n *Needle) ParsePath(fid string) {
 	length := len(fid)
 	if length <= 8 {
-		log.Println("Invalid fid", fid, "length", length)
+		if length > 0 {
+			log.Println("Invalid fid", fid, "length", length)
+		}
 		return
 	}
 	n.Key, n.Cookie = ParseKeyHash(fid)