diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-09-21 19:49:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 19:49:15 -0700 |
| commit | ec5b9f1e91a8609d0e70bf9d26dc0840774153c4 (patch) | |
| tree | 48ede45893c2130d3e039f7fe4af8440835eb02d /weed/command/server.go | |
| parent | 9cdbfc1a4987bdb46f16ae37624ed69ef66778a9 (diff) | |
| parent | 658fc2e5b619c453ddecc805bc363a25f75ff22d (diff) | |
| download | seaweedfs-ec5b9f1e91a8609d0e70bf9d26dc0840774153c4.tar.xz seaweedfs-ec5b9f1e91a8609d0e70bf9d26dc0840774153c4.zip | |
Merge pull request #1475 from levenlabs/lock
Fix deadlock with KeepConnected and SendHeartbeat
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 6f40263bb..aee62290a 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -99,7 +99,7 @@ func init() { serverOptions.v.fileSizeLimitMB = cmdServer.Flag.Int("volume.fileSizeLimitMB", 1024, "limit file size to avoid out of memory") serverOptions.v.publicUrl = cmdServer.Flag.String("volume.publicUrl", "", "publicly accessible address") serverOptions.v.preStopSeconds = cmdServer.Flag.Int("volume.preStopSeconds", 10, "number of seconds between stop send heartbeats and stop volume server") - serverOptions.v.pprof = &False + serverOptions.v.pprof = cmdServer.Flag.Bool("volume.pprof", false, "enable pprof http handlers. precludes --memprofile and --cpuprofile") s3Options.port = cmdServer.Flag.Int("s3.port", 8333, "s3 server http listen port") s3Options.domainName = cmdServer.Flag.String("s3.domainName", "", "suffix of the host name, {bucket}.{domainName}") |
