From c9bc52a8a6b5fb05332e64476cdf38ab9c665ffd Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 10 Nov 2021 15:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/storage/obs.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/storage/obs.go b/modules/storage/obs.go index c1009122c..92ab9ba2e 100755 --- a/modules/storage/obs.go +++ b/modules/storage/obs.go @@ -236,13 +236,8 @@ func ObsCopyManyFile(srcBucket string, srcPath string, destBucket string, destPa log.Info("Page:%d\n", index) index++ for _, val := range output.Contents { - // if strings.HasSuffix(val.Key, "/") { - // log.Info("copy file, src key=" + val.Key + " is dir, not copy.") - // continue - // } destKey := destPath + val.Key[length:] - log.Info("copy file,bucket=" + srcBucket + " src key=" + val.Key + "destbucket=" + destBucket + " dest key=" + destKey) - ObsCopyFile(srcBucket, val.Key, destBucket, destKey) + obsCopyFile(srcBucket, val.Key, destBucket, destKey) fileTotalSize += val.Size } if output.IsTruncated { @@ -261,7 +256,7 @@ func ObsCopyManyFile(srcBucket string, srcPath string, destBucket string, destPa return fileTotalSize, nil } -func ObsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKeyName string) error { +func obsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKeyName string) error { input := &obs.CopyObjectInput{} input.Bucket = destBucket input.Key = destKeyName @@ -271,6 +266,7 @@ func ObsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKey if err == nil { log.Info("copy success,destBuckName:%s, destkeyname:%s", destBucket, destKeyName) } else { + log.Info("copy failed,,destBuckName:%s, destkeyname:%s", destBucket, destKeyName) if obsError, ok := err.(obs.ObsError); ok { log.Info(obsError.Code) log.Info(obsError.Message)