diff options
| author | chrislu <chris.lu@gmail.com> | 2022-09-17 10:18:14 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-09-17 10:18:14 -0700 |
| commit | 1c79301f89762ed25a431bcb5f4e02858dc02218 (patch) | |
| tree | d0d6c5c44f7524ec38d7002e393d194769278649 /weed/command/s3.go | |
| parent | 956ce6416fae66646344782cc7f6f557708eb1f4 (diff) | |
| parent | 3fc261d27c90fc06c1d555dd998d7535b844a746 (diff) | |
| download | seaweedfs-1c79301f89762ed25a431bcb5f4e02858dc02218.tar.xz seaweedfs-1c79301f89762ed25a431bcb5f4e02858dc02218.zip | |
Merge branch 'master' into message_send
Diffstat (limited to 'weed/command/s3.go')
| -rw-r--r-- | weed/command/s3.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/weed/command/s3.go b/weed/command/s3.go index 33dc7482a..aa435b822 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -57,6 +57,7 @@ func init() { s3StandaloneOptions.metricsHttpPort = cmdS3.Flag.Int("metricsPort", 0, "Prometheus metrics listen port") s3StandaloneOptions.allowEmptyFolder = cmdS3.Flag.Bool("allowEmptyFolder", true, "allow empty folders") s3StandaloneOptions.allowDeleteBucketNotEmpty = cmdS3.Flag.Bool("allowDeleteBucketNotEmpty", true, "allow recursive deleting all entries along with bucket") + s3StandaloneOptions.localFilerSocket = cmdS3.Flag.String("localFilerSocket", "", "local filer socket path") } var cmdS3 = &Command{ @@ -214,7 +215,7 @@ func (s3opt *S3Options) startS3Server() bool { } listenAddress := fmt.Sprintf("%s:%d", *s3opt.bindIp, *s3opt.port) - s3ApiListener, s3ApiLocalListner, err := util.NewIpAndLocalListeners(*s3opt.bindIp, *s3opt.port, time.Duration(10)*time.Second) + s3ApiListener, s3ApiLocalListener, err := util.NewIpAndLocalListeners(*s3opt.bindIp, *s3opt.port, time.Duration(10)*time.Second) if err != nil { glog.Fatalf("S3 API Server listener on %s error: %v", listenAddress, err) } @@ -242,9 +243,9 @@ func (s3opt *S3Options) startS3Server() bool { if *s3opt.tlsPrivateKey != "" { glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) - if s3ApiLocalListner != nil { + if s3ApiLocalListener != nil { go func() { - if err = httpS.ServeTLS(s3ApiLocalListner, *s3opt.tlsCertificate, *s3opt.tlsPrivateKey); err != nil { + if err = httpS.ServeTLS(s3ApiLocalListener, *s3opt.tlsCertificate, *s3opt.tlsPrivateKey); err != nil { glog.Fatalf("S3 API Server Fail to serve: %v", err) } }() @@ -254,9 +255,9 @@ func (s3opt *S3Options) startS3Server() bool { } } else { glog.V(0).Infof("Start Seaweed S3 API Server %s at http port %d", util.Version(), *s3opt.port) - if s3ApiLocalListner != nil { + if s3ApiLocalListener != nil { go func() { - if err = httpS.Serve(s3ApiLocalListner); err != nil { + if err = httpS.Serve(s3ApiLocalListener); err != nil { glog.Fatalf("S3 API Server Fail to serve: %v", err) } }() |