From 6d0f7330e37360d791266bc31d026c4f2cfaad96 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 9 May 2024 09:02:16 +0200 Subject: [PATCH] Remove RLIMIT_NOFILE bump Starting with Go 1.19 [0] the file limit is increased by default. [0]: https://github.com/golang/go/commit/8427429c592588af8c49522c76b3e0e0e335d270 --- cmd/soju/main.go | 4 ---- cmd/soju/rlimit.go | 20 -------------------- cmd/soju/rlimit_stub.go | 7 ------- 3 files changed, 31 deletions(-) delete mode 100644 cmd/soju/rlimit.go delete mode 100644 cmd/soju/rlimit_stub.go diff --git a/cmd/soju/main.go b/cmd/soju/main.go index 9f254e2..8958cec 100644 --- a/cmd/soju/main.go +++ b/cmd/soju/main.go @@ -134,10 +134,6 @@ func main() { cfg.Listen = []string{":6697"} } - if err := bumpOpenedFileLimit(); err != nil { - log.Printf("failed to bump max number of opened files: %v", err) - } - db, err := database.Open(cfg.DB.Driver, cfg.DB.Source) if err != nil { log.Fatalf("failed to open database: %v", err) diff --git a/cmd/soju/rlimit.go b/cmd/soju/rlimit.go deleted file mode 100644 index 56e6a1b..0000000 --- a/cmd/soju/rlimit.go +++ /dev/null @@ -1,20 +0,0 @@ -//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris - -package main - -import ( - "fmt" - "syscall" -) - -func bumpOpenedFileLimit() error { - var rlimit syscall.Rlimit - if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit); err != nil { - return fmt.Errorf("failed to get RLIMIT_NOFILE: %v", err) - } - rlimit.Cur = rlimit.Max - if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlimit); err != nil { - return fmt.Errorf("failed to set RLIMIT_NOFILE: %v", err) - } - return nil -} diff --git a/cmd/soju/rlimit_stub.go b/cmd/soju/rlimit_stub.go deleted file mode 100644 index b27ea7e..0000000 --- a/cmd/soju/rlimit_stub.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris - -package main - -func bumpOpenedFileLimit() error { - return nil -}