diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-09-06 20:20:23 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 08:20:23 -0700 |
| commit | f4f6855c61150282295ec0b10233d9b1585153e3 (patch) | |
| tree | f66e012b951b26ff903c2f2b20f1cc06c04013a7 /weed/command/s3.go | |
| parent | 3c3682fcce4649089dc0425e82c2df613dd200c3 (diff) | |
| download | seaweedfs-f4f6855c61150282295ec0b10233d9b1585153e3.tar.xz seaweedfs-f4f6855c61150282295ec0b10233d9b1585153e3.zip | |
avoid SIGSEGV on localFilerSocket (#3609)
https://github.com/seaweedfs/seaweedfs/issues/3607
Diffstat (limited to 'weed/command/s3.go')
| -rw-r--r-- | weed/command/s3.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/command/s3.go b/weed/command/s3.go index d69ac214c..33dc7482a 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -184,7 +184,10 @@ func (s3opt *S3Options) startS3Server() bool { go stats_collect.LoopPushingMetric("s3", stats_collect.SourceName(uint32(*s3opt.port)), metricsAddress, metricsIntervalSec) router := mux.NewRouter().SkipClean(true) - + var localFilerSocket string + if s3opt.localFilerSocket != nil { + localFilerSocket = *s3opt.localFilerSocket + } s3ApiServer, s3ApiServer_err := s3api.NewS3ApiServer(router, &s3api.S3ApiServerOption{ Filer: filerAddress, Port: *s3opt.port, @@ -194,7 +197,7 @@ func (s3opt *S3Options) startS3Server() bool { GrpcDialOption: grpcDialOption, AllowEmptyFolder: *s3opt.allowEmptyFolder, AllowDeleteBucketNotEmpty: *s3opt.allowDeleteBucketNotEmpty, - LocalFilerSocket: *s3opt.localFilerSocket, + LocalFilerSocket: localFilerSocket, DataCenter: *s3opt.dataCenter, }) if s3ApiServer_err != nil { |