error handling

weed-fs/src/cmd/weed/master.go

@@ -45,7 +45,8 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) {
 	if commaSep > 0 {
 		vid = vid[0:commaSep]
 	}
-	volumeId, _ := storage.NewVolumeId(vid)
+	volumeId, err := storage.NewVolumeId(vid)
+	if err == nil {
 		machines := topo.Lookup(volumeId)
 		if machines != nil {
 			ret := []map[string]string{}
@@ -54,9 +55,9 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) {
 			}
 			writeJson(w, r, map[string]interface{}{"locations": ret})
 		} else {
-		log.Println("Invalid volume id", volumeId)
 			writeJson(w, r, map[string]string{"error": "volume id " + volumeId.String() + " not found. "})
 		}
+	}
 }
 
 func dirAssignHandler(w http.ResponseWriter, r *http.Request) {

weed-fs/src/cmd/weed/volume.go

@@ -65,21 +65,29 @@ func storeHandler(w http.ResponseWriter, r *http.Request) {
 func GetHandler(w http.ResponseWriter, r *http.Request) {
 	n := new(storage.Needle)
 	vid, fid, ext := parseURLPath(r.URL.Path)
-	volumeId, _ := storage.NewVolumeId(vid)
+	volumeId, err := storage.NewVolumeId(vid)
+	if err != nil {
+		if *IsDebug {
+			log.Println("parsing error:", err, r.URL.Path)
+		}
+		return
+	}
 	n.ParsePath(fid)
 
 	if *IsDebug {
 		log.Println("volume", volumeId, "reading", n)
 	}
 	if !store.HasVolume(volumeId) {
-		lookupResult, err := operation.Lookup(*server, volumeId)
+		lookupResult, err := operation.Lookup(*masterNode, volumeId)
 		if *IsDebug {
 			log.Println("volume", volumeId, "found on", lookupResult, "error", err)
 		}
 		if err == nil {
 			http.Redirect(w, r, "http://"+lookupResult.Locations[0].PublicUrl+r.URL.Path, http.StatusMovedPermanently)
 		} else {
-    log.Println("lookup error:", err)
+			if *IsDebug {
+				log.Println("lookup error:", err, r.URL.Path)
+			}
 			w.WriteHeader(http.StatusNotFound)
 		}
 		return