diff options
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_fs_configure.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_s3_circuitbreaker.go | 11 | ||||
| -rw-r--r-- | weed/shell/command_s3_clean_uploads.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_s3_configure.go | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/weed/shell/command_fs_configure.go b/weed/shell/command_fs_configure.go index 35f49688d..c27c6c7b5 100644 --- a/weed/shell/command_fs_configure.go +++ b/weed/shell/command_fs_configure.go @@ -136,7 +136,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io var buf2 bytes.Buffer fc.ToText(&buf2) - fmt.Fprintf(writer, string(buf2.Bytes())) + fmt.Fprint(writer, buf2.String()) fmt.Fprintln(writer) if *apply { diff --git a/weed/shell/command_s3_circuitbreaker.go b/weed/shell/command_s3_circuitbreaker.go index 5abc2d429..43ff454f7 100644 --- a/weed/shell/command_s3_circuitbreaker.go +++ b/weed/shell/command_s3_circuitbreaker.go @@ -4,13 +4,14 @@ import ( "bytes" "flag" "fmt" - "github.com/seaweedfs/seaweedfs/weed/filer" - "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" - "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "io" "strconv" "strings" + "github.com/seaweedfs/seaweedfs/weed/filer" + "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" ) @@ -180,8 +181,8 @@ func (c *commandS3CircuitBreaker) Do(args []string, commandEnv *CommandEnv, writ return err } - _, _ = fmt.Fprintf(writer, string(buf.Bytes())) - _, _ = fmt.Fprintln(writer) + fmt.Fprint(writer, buf.String()) + fmt.Fprintln(writer) if *apply { if err := commandEnv.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { diff --git a/weed/shell/command_s3_clean_uploads.go b/weed/shell/command_s3_clean_uploads.go index aa296dd67..bfce5d54d 100644 --- a/weed/shell/command_s3_clean_uploads.go +++ b/weed/shell/command_s3_clean_uploads.go @@ -64,7 +64,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer for _, bucket := range buckets { if err := c.cleanupUploads(commandEnv, writer, filerBucketsPath, bucket, *uploadedTimeAgo, signingKey); err != nil { - fmt.Fprintf(writer, fmt.Sprintf("failed cleanup uploads for bucket %s: %v", bucket, err)) + fmt.Fprintf(writer, "failed cleanup uploads for bucket %s: %v", bucket, err) } } diff --git a/weed/shell/command_s3_configure.go b/weed/shell/command_s3_configure.go index 0726bd143..478d62a6d 100644 --- a/weed/shell/command_s3_configure.go +++ b/weed/shell/command_s3_configure.go @@ -176,7 +176,7 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io buf.Reset() filer.ProtoToText(&buf, s3cfg) - fmt.Fprintf(writer, string(buf.Bytes())) + fmt.Fprint(writer, buf.String()) fmt.Fprintln(writer) if *apply { |