bugfix: use rawUrl to interact with source server

Signed-off-by: Starnop <starnop@163.com>
dragonflyoss · Jul 24, 2019 · 1462972 · 1462972
1 parent c5d0873
commit 1462972
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dfdaemon/proxy/proxy.go b/dfdaemon/proxy/proxy.go
@@ -216,7 +216,7 @@ func (proxy *Proxy) handleHTTP(w http.ResponseWriter, req *http.Request) {
 	copyHeader(w.Header(), resp.Header)
 	w.WriteHeader(resp.StatusCode)
 	if _, err := io.Copy(w, resp.Body); err != nil {
-		logrus.Errorf("failed to write http body")
+		logrus.Errorf("failed to write http body: %v", err)
 	}
 }
 

diff --git a/supernode/daemon/mgr/cdn/manager.go b/supernode/daemon/mgr/cdn/manager.go
@@ -84,7 +84,7 @@ func (cm *Manager) TriggerCDN(ctx context.Context, task *types.TaskInfo) (*types
 	pieceContSize := task.PieceSize - config.PieceWrapSize
 
 	// start to download the source file
-	resp, err := cm.download(ctx, task.ID, task.TaskURL, task.Headers, startPieceNum, httpFileLength, pieceContSize)
+	resp, err := cm.download(ctx, task.ID, task.RawURL, task.Headers, startPieceNum, httpFileLength, pieceContSize)
 	if err != nil {
 		return getUpdateTaskInfoWithStatusOnly(types.TaskInfoCdnStatusFAILED), err
 	}

diff --git a/supernode/daemon/mgr/task/manager_util.go b/supernode/daemon/mgr/task/manager_util.go
@@ -56,7 +56,7 @@ func (tm *Manager) addOrUpdateTask(ctx context.Context, req *types.TaskCreateReq
 	}
 
 	// get fileLength with req.Headers
-	fileLength, err := getHTTPFileLength(taskID, task.TaskURL, req.Headers)
+	fileLength, err := getHTTPFileLength(taskID, task.RawURL, req.Headers)
 	if err != nil {
 		logrus.Errorf("failed to get file length from http client for taskID(%s): %v", taskID, err)
 	}