Skip to content

Commit

Permalink
Merge pull request #2884 from ipfs/feat/default-fd-bump
Browse files Browse the repository at this point in the history
raise file descriptor limit to 1024 by default
  • Loading branch information
whyrusleeping authored Jun 21, 2016
2 parents 7d18f74 + deecc5d commit c98bf9a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/ipfs/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Headers.
cmds.BoolOption(unrestrictedApiAccessKwd, "This option has no effect since v0.4.3").Default(false),
cmds.BoolOption(unencryptTransportKwd, "Disable transport encryption (for debugging protocols)").Default(false),
cmds.BoolOption(enableGCKwd, "Enable automatic periodic repo garbage collection").Default(false),
cmds.BoolOption(adjustFDLimitKwd, "Check and raise file descriptor limits if needed").Default(false),
cmds.BoolOption(adjustFDLimitKwd, "Check and raise file descriptor limits if needed").Default(true),
cmds.BoolOption(offlineKwd, "Run offline. Do not connect to the rest of the network but provide local API.").Default(false),

// TODO: add way to override addresses. tricky part: updating the config if also --init.
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/ulimit_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"
)

var ipfsFileDescNum = uint64(2048)
var ipfsFileDescNum = uint64(1024)

func init() {
if val := os.Getenv("IPFS_FD_MAX"); val != "" {
Expand Down

0 comments on commit c98bf9a

Please sign in to comment.