diff options
| author | guosj <515878133@qq.com> | 2022-04-19 09:25:32 +0800 |
|---|---|---|
| committer | guosj <515878133@qq.com> | 2022-04-19 09:25:32 +0800 |
| commit | 82ee31965dd7a1ad2d348c7e9dadb254744bf9b0 (patch) | |
| tree | 593eb933dffc877010c761b2c55ec6c73875e9a3 /weed/command/server.go | |
| parent | 5c9a3bb8cf68ed99acb53dd548c92b54744d7fd7 (diff) | |
| parent | e6ebafc094dc0ce0e3b0a68d7735f52a544bc479 (diff) | |
| download | seaweedfs-82ee31965dd7a1ad2d348c7e9dadb254744bf9b0.tar.xz seaweedfs-82ee31965dd7a1ad2d348c7e9dadb254744bf9b0.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs into chrislusf-master
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index a1b495c5f..e3aec67d1 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -138,6 +138,7 @@ func init() { s3Options.config = cmdServer.Flag.String("s3.config", "", "path to the config file") s3Options.auditLogConfig = cmdServer.Flag.String("s3.auditLogConfig", "", "path to the audit log config file") s3Options.allowEmptyFolder = cmdServer.Flag.Bool("s3.allowEmptyFolder", true, "allow empty folders") + s3Options.allowDeleteBucketNotEmpty = cmdServer.Flag.Bool("s3.allowDeleteBucketNotEmpty", true, "allow recursive deleting all entries along with bucket") iamOptions.port = cmdServer.Flag.Int("iam.port", 8111, "iam server http listen port") @@ -191,7 +192,7 @@ func runServer(cmd *Command, args []string) bool { // ip address masterOptions.ip = serverIp masterOptions.ipBind = serverBindIp - filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToAddresses() + filerOptions.masters = pb.ServerAddresses(*masterOptions.peers).ToAddressMap() filerOptions.ip = serverIp filerOptions.bindIp = serverBindIp s3Options.bindIp = serverBindIp |