mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
simplify
This commit is contained in:
parent
3741779144
commit
cc0c8c5f81
|
@ -102,7 +102,20 @@ func (s3sink *S3Sink) DeleteEntry(key string, isDirectory, deleteIncludeChunks b
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return s3sink.deleteObject(key)
|
input := &s3.DeleteObjectInput{
|
||||||
|
Bucket: aws.String(s3sink.bucket),
|
||||||
|
Key: aws.String(key),
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := s3sink.conn.DeleteObject(input)
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
glog.V(2).Infof("[%s] delete %s: %v", s3sink.bucket, key, result)
|
||||||
|
} else {
|
||||||
|
glog.Errorf("[%s] delete %s: %v", s3sink.bucket, key, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
package S3Sink
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
|
||||||
"github.com/aws/aws-sdk-go/service/s3"
|
|
||||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s3sink *S3Sink) deleteObject(key string) error {
|
|
||||||
input := &s3.DeleteObjectInput{
|
|
||||||
Bucket: aws.String(s3sink.bucket),
|
|
||||||
Key: aws.String(key),
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := s3sink.conn.DeleteObject(input)
|
|
||||||
|
|
||||||
if err == nil {
|
|
||||||
glog.V(2).Infof("[%s] delete %s: %v", s3sink.bucket, key, result)
|
|
||||||
} else {
|
|
||||||
glog.Errorf("[%s] delete %s: %v", s3sink.bucket, key, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in a new issue