gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Remove glog from http_util for better reusability.

Browse source
This commit is contained in:
Chris Lu 2014-06-07 13:27:28 -07:00
parent a437d77431
commit d2f3cab8e1
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
go/util/http_util.go
View file

@ -2,7 +2,6 @@ package util
import ( import (
"bytes" "bytes"
"code.google.com/p/weed-fs/go/glog"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
@ -25,13 +24,11 @@ func init() {
func PostBytes(url string, body []byte) ([]byte, error) { func PostBytes(url string, body []byte) ([]byte, error) {
r, err := client.Post(url, "application/octet-stream", bytes.NewReader(body)) r, err := client.Post(url, "application/octet-stream", bytes.NewReader(body))
if err != nil { if err != nil {
glog.V(0).Infoln(err)
return nil, err return nil, err
} }
defer r.Body.Close() defer r.Body.Close()
b, err := ioutil.ReadAll(r.Body) b, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
glog.V(0).Infoln("read post result from", url, err)
return nil, err return nil, err
} }
return b, nil return b, nil
@ -40,13 +37,11 @@ func PostBytes(url string, body []byte) ([]byte, error) {
func Post(url string, values url.Values) ([]byte, error) { func Post(url string, values url.Values) ([]byte, error) {
r, err := client.PostForm(url, values) r, err := client.PostForm(url, values)
if err != nil { if err != nil {
glog.V(0).Infoln(err)
return nil, err return nil, err
} }
defer r.Body.Close() defer r.Body.Close()
b, err := ioutil.ReadAll(r.Body) b, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
glog.V(0).Infoln("read post result from", url, err)
return nil, err return nil, err
} }
return b, nil return b, nil
@ -55,7 +50,6 @@ func Post(url string, values url.Values) ([]byte, error) {
func Get(url string) ([]byte, error) { func Get(url string) ([]byte, error) {
r, err := client.Get(url) r, err := client.Get(url)
if err != nil { if err != nil {
glog.V(0).Infoln(err)
return nil, err return nil, err
} }
defer r.Body.Close() defer r.Body.Close()
@ -64,7 +58,6 @@ func Get(url string) ([]byte, error) {
return nil, fmt.Errorf("%s: %s", url, r.Status) return nil, fmt.Errorf("%s: %s", url, r.Status)
} }
if err != nil { if err != nil {
glog.V(0).Infoln("read get result from", url, err)
return nil, err return nil, err
} }
return b, nil return b, nil
@ -73,17 +66,14 @@ func Get(url string) ([]byte, error) {
func Delete(url string) error { func Delete(url string) error {
req, err := http.NewRequest("DELETE", url, nil) req, err := http.NewRequest("DELETE", url, nil)
if err != nil { if err != nil {
glog.V(0).Infoln("failing to delete", url)
return err return err
} }
resp, e := client.Do(req) resp, e := client.Do(req)
if e != nil { if e != nil {
glog.V(0).Infoln(e)
return e return e
} }
defer resp.Body.Close() defer resp.Body.Close()
if _, err := ioutil.ReadAll(resp.Body); err != nil { if _, err := ioutil.ReadAll(resp.Body); err != nil {
glog.V(0).Infoln("read get result from", url, err)
return err return err
} }
return nil return nil
@ -97,13 +87,10 @@ func DownloadUrl(fileUrl string) (filename string, content []byte, e error) {
defer response.Body.Close() defer response.Body.Close()
contentDisposition := response.Header["Content-Disposition"] contentDisposition := response.Header["Content-Disposition"]
if len(contentDisposition) > 0 { if len(contentDisposition) > 0 {
glog.V(4).Info("Content-Disposition: ", contentDisposition[0])
if strings.HasPrefix(contentDisposition[0], "filename=") { if strings.HasPrefix(contentDisposition[0], "filename=") {
filename = contentDisposition[0][len("filename="):] filename = contentDisposition[0][len("filename="):]
filename = strings.Trim(filename, "\"") filename = strings.Trim(filename, "\"")
} }
} else {
glog.V(4).Info("No Content-Disposition!")
} }
content, e = ioutil.ReadAll(response.Body) content, e = ioutil.ReadAll(response.Body)
return return