diff options
Diffstat (limited to 'weed/util/http')
| -rw-r--r-- | weed/util/http/http_global_client_init.go | 4 | ||||
| -rw-r--r-- | weed/util/http/http_global_client_util.go | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/weed/util/http/http_global_client_init.go b/weed/util/http/http_global_client_init.go index 0dcb05cfd..d4f4d752c 100644 --- a/weed/util/http/http_global_client_init.go +++ b/weed/util/http/http_global_client_init.go @@ -1,7 +1,7 @@ package http import ( - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" util_http_client "github.com/seaweedfs/seaweedfs/weed/util/http/client" ) @@ -22,6 +22,6 @@ func InitGlobalHttpClient() { globalHttpClient, err = NewGlobalHttpClient() if err != nil { - glog.Fatalf("error init global http client: %v", err) + log.Fatalf("error init global http client: %v", err) } } diff --git a/weed/util/http/http_global_client_util.go b/weed/util/http/http_global_client_util.go index 33d978d9e..e2e6dfbba 100644 --- a/weed/util/http/http_global_client_util.go +++ b/weed/util/http/http_global_client_util.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" ) var ErrNotFound = fmt.Errorf("not found") @@ -281,7 +281,7 @@ func ReadUrl(fileUrl string, cipherKey []byte, isContentCompressed bool, isFullC // drains the response body to avoid memory leak data, _ := io.ReadAll(reader) if len(data) != 0 { - glog.V(1).Infof("%s reader has remaining %d bytes", contentEncoding, len(data)) + log.V(2).Infof("%s reader has remaining %d bytes", contentEncoding, len(data)) } return n, err } @@ -363,7 +363,7 @@ func readEncryptedUrl(fileUrl, jwt string, cipherKey []byte, isContentCompressed if isContentCompressed { decryptedData, err = util.DecompressData(decryptedData) if err != nil { - glog.V(0).Infof("unzip decrypt %s: %v", fileUrl, err) + log.V(3).Infof("unzip decrypt %s: %v", fileUrl, err) } } if len(decryptedData) < int(offset)+size { @@ -423,7 +423,7 @@ func CloseResponse(resp *http.Response) { io.Copy(io.Discard, reader) resp.Body.Close() if reader.BytesRead > 0 { - glog.V(1).Infof("response leftover %d bytes", reader.BytesRead) + log.V(2).Infof("response leftover %d bytes", reader.BytesRead) } } @@ -432,7 +432,7 @@ func CloseRequest(req *http.Request) { io.Copy(io.Discard, reader) req.Body.Close() if reader.BytesRead > 0 { - glog.V(1).Infof("request leftover %d bytes", reader.BytesRead) + log.V(2).Infof("request leftover %d bytes", reader.BytesRead) } } @@ -467,13 +467,13 @@ func RetriedFetchChunkData(buffer []byte, urlStrings []string, cipherKey []byte, break } if err != nil { - glog.V(0).Infof("read %s failed, err: %v", urlString, err) + log.V(3).Infof("read %s failed, err: %v", urlString, err) } else { break } } if err != nil && shouldRetry { - glog.V(0).Infof("retry reading in %v", waitTime) + log.V(3).Infof("retry reading in %v", waitTime) time.Sleep(waitTime) } else { break |
