Browse Source

change to util.WriteFile

pull/2643/head
chrislu 3 years ago
parent
commit
affe3c2c12
  1. 4
      weed/command/scaffold.go
  2. 3
      weed/images/orientation_test.go
  3. 2
      weed/images/resizing_test.go
  4. 2
      weed/replication/sub/notification_kafka.go
  5. 2
      weed/server/volume_grpc_copy.go

4
weed/command/scaffold.go

@ -2,7 +2,7 @@ package command
import (
"fmt"
"os"
"github.com/chrislusf/seaweedfs/weed/util"
"path/filepath"
"github.com/chrislusf/seaweedfs/weed/command/scaffold"
@ -56,7 +56,7 @@ func runScaffold(cmd *Command, args []string) bool {
}
if *outputPath != "" {
os.WriteFile(filepath.Join(*outputPath, *config+".toml"), []byte(content), 0644)
util.WriteFile(filepath.Join(*outputPath, *config+".toml"), []byte(content), 0644)
} else {
fmt.Println(content)
}

3
weed/images/orientation_test.go

@ -1,6 +1,7 @@
package images
import (
"github.com/chrislusf/seaweedfs/weed/util"
"os"
"testing"
)
@ -12,7 +13,7 @@ func TestXYZ(t *testing.T) {
fixed_data := FixJpgOrientation(dat)
os.WriteFile("fixed1.jpg", fixed_data, 0644)
util.WriteFile("fixed1.jpg", fixed_data, 0644)
os.Remove("fixed1.jpg")

2
weed/images/resizing_test.go

@ -15,7 +15,7 @@ func TestResizing(t *testing.T) {
buf := new(bytes.Buffer)
buf.ReadFrom(resized)
os.WriteFile("resized1.png", buf.Bytes(), 0644)
util.WriteFile("resized1.png", buf.Bytes(), 0644)
os.Remove("resized1.png")

2
weed/replication/sub/notification_kafka.go

@ -137,7 +137,7 @@ func (progress *KafkaProgress) saveProgress() error {
if err != nil {
return fmt.Errorf("failed to marshal progress: %v", err)
}
err = os.WriteFile(progress.offsetFile, data, 0640)
err = util.WriteFile(progress.offsetFile, data, 0640)
if err != nil {
return fmt.Errorf("failed to save progress to %s: %v", progress.offsetFile, err)
}

2
weed/server/volume_grpc_copy.go

@ -67,7 +67,7 @@ func (vs *VolumeServer) VolumeCopy(req *volume_server_pb.VolumeCopyRequest, stre
dataBaseFileName = storage.VolumeFileName(location.Directory, volFileInfoResp.Collection, int(req.VolumeId))
indexBaseFileName = storage.VolumeFileName(location.IdxDirectory, volFileInfoResp.Collection, int(req.VolumeId))
os.WriteFile(dataBaseFileName+".note", []byte(fmt.Sprintf("copying from %s", req.SourceDataNode)), 0755)
util.WriteFile(dataBaseFileName+".note", []byte(fmt.Sprintf("copying from %s", req.SourceDataNode)), 0755)
defer func() {
if err != nil {

Loading…
Cancel
Save