better error reporting and handling

2 files changed, 6 insertions, 4 deletions

diff --git a/weed-fs/src/pkg/operation/delete_content.go b/weed-fs/src/pkg/operation/delete_content.go
index 66a61f55c..aeab9c3ac 100644
--- a/weed-fs/src/pkg/operation/delete_content.go
+++ b/weed-fs/src/pkg/operation/delete_content.go
@@ -2,11 +2,13 @@ package operation
 
 import (
 	"net/http"
+	"log"
 )
 
 func Delete(url string) error {
 	req, err := http.NewRequest("DELETE", url, nil)
 	if err != nil {
+		log.Println("failing to delete", url)
 		return err
 	}
 	_, err = http.DefaultClient.Do(req)
diff --git a/weed-fs/src/pkg/operation/upload_content.go b/weed-fs/src/pkg/operation/upload_content.go
index ce2e5af68..652cbe71b 100644
--- a/weed-fs/src/pkg/operation/upload_content.go
+++ b/weed-fs/src/pkg/operation/upload_content.go
@@ -6,6 +6,7 @@ import (
 	_ "fmt"
 	"io"
 	"io/ioutil"
+  "log"
 	"mime/multipart"
 	"net/http"
 )
@@ -23,7 +24,7 @@ func Upload(uploadUrl string, filename string, reader io.Reader) (*UploadResult,
 	body_writer.Close()
 	resp, err := http.Post(uploadUrl, content_type, body_buf)
 	if err != nil {
-		println("uploading to", uploadUrl)
+    log.Println("failing to upload to", uploadUrl)
 		return nil, err
 	}
 	defer resp.Body.Close()
@@ -34,9 +35,8 @@ func Upload(uploadUrl string, filename string, reader io.Reader) (*UploadResult,
 	var ret UploadResult
 	err = json.Unmarshal(resp_body, &ret)
 	if err != nil {
-		println("upload response to", uploadUrl, resp_body)
-		panic(err.Error())
+    log.Println("failing to read upload resonse", uploadUrl, resp_body)
+    return nil, err
 	}
-	//fmt.Println("Uploaded " + strconv.Itoa(ret.Size) + " Bytes to " + uploadUrl)
 	return &ret, nil
 }