From 272db028a5688e90f682240a25120a7d0b32d243 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 27 十二月 2019 15:44:14 +0800
Subject: [PATCH] add timeout set
---
WeedFSClient.go | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/WeedFSClient.go b/WeedFSClient.go
index 5264404..f513168 100644
--- a/WeedFSClient.go
+++ b/WeedFSClient.go
@@ -12,7 +12,7 @@
"time"
)
-func UploadFile(uri string, fileName string, fileData []byte) (weedFilePath string, err error) {
+func UploadFile(uri string, fileName string, fileData []byte,timeout time.Duration) (weedFilePath string, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err = writer.CreateFormFile("file", fileName)
@@ -28,7 +28,9 @@
//writer.WriteField(key, val)
request, err := http.NewRequest("POST", uri, request_reader)
request.Header.Add("Content-Type", writer.FormDataContentType())
- timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ if timeout <=0 {
+ timeout = 5 * time.Second
+ }
client := &http.Client{Timeout: timeout}
resp, err := client.Do(request)
if err != nil {
@@ -82,7 +84,7 @@
return "http://"+m["url"].(string)+"/"+m["fid"].(string),err
}
-func UpDateFile(uri string, fileName string, fileData []byte) (m map[string]interface{}, err error) {
+func UpDateFile(uri string, fileName string, fileData []byte,timeout time.Duration) (m map[string]interface{}, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err = writer.CreateFormFile("file", fileName)
@@ -98,7 +100,9 @@
//writer.WriteField(key, val)
request, err := http.NewRequest("POST", uri, request_reader)
request.Header.Add("Content-Type", writer.FormDataContentType())
- timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ if timeout <= 0 {
+ timeout = time.Duration(5 * time.Second) //瓒呮椂鏃堕棿5s
+ }
client := &http.Client{Timeout: timeout}
resp, err := client.Do(request)
if err != nil {
--
Gitblit v1.8.0