From 3982a8e970fd07edd60dc756b57fa74a50382473 Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Tue, 26 Jan 2021 11:26:36 -0600 Subject: [PATCH] format messages and change mmap comparison logic --- server/server.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index 8ab8402b9..ac06bc0fa 100644 --- a/server/server.go +++ b/server/server.go @@ -24,7 +24,6 @@ import ( "context" "crypto/tls" "encoding/binary" - "fmt" "io" "log" "math/rand" @@ -155,13 +154,13 @@ func (m *Command) Start() (err error) { return errors.Wrap(err, "setting up server") } - cmd, err := exec.Command("sysctl", "vm.max_map_count").Output() - data := binary.BigEndian.Uint64(cmd) + result, err := exec.Command("sysctl", "vm.max_map_count").Output() if err != nil { - fmt.Println("Error: ", err) + m.logger.Printf("Tried unsuccessfully to check system mmap limit: %v", err) } else { - if m.Config.MaxMapCount >= data { - m.logger.Printf("grpc server error: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, data) + sysMmapLimit := binary.BigEndian.Uint64(result) + if m.Config.MaxMapCount > sysMmapLimit { + m.logger.Printf("WARNING: Config max map limit (%v) is greater than current system limits (%v)", m.Config.MaxMapCount, sysMmapLimit) } }