Skip to content

Commit 1ad49bd

Browse files
committed
add AutoProcMemLimit
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 36c55ee commit 1ad49bd

File tree

2 files changed

+3
-26
lines changed

2 files changed

+3
-26
lines changed

common.logger.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package main
22

33
import (
4-
"log/slog"
5-
64
"go.uber.org/zap"
7-
"go.uber.org/zap/exp/zapslog"
85
"go.uber.org/zap/zapcore"
96
)
107

118
var (
12-
logger *zap.SugaredLogger
13-
slogger *slog.Logger
9+
logger *zap.SugaredLogger
1410
)
1511

1612
func initLogger() *zap.SugaredLogger {
@@ -45,7 +41,6 @@ func initLogger() *zap.SugaredLogger {
4541
}
4642

4743
logger = log.Sugar()
48-
slogger = slog.New(zapslog.NewHandler(log.Core()))
4944

5045
return logger
5146
}

common.system.go

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
package main
22

33
import (
4-
"github.com/KimMachineGun/automemlimit/memlimit"
5-
humanize "github.com/dustin/go-humanize"
4+
"github.com/webdevops/go-common/system"
65
)
76

87
func initSystem() {
9-
// set memory limit
10-
goMemLimit, err := memlimit.SetGoMemLimitWithOpts(
11-
memlimit.WithProvider(
12-
memlimit.ApplyFallback(
13-
memlimit.FromCgroup,
14-
memlimit.FromSystem,
15-
),
16-
),
17-
memlimit.WithLogger(slogger),
18-
)
19-
20-
if goMemLimit > 0 {
21-
logger.Infof(`GOMEMLIMIT updated to %v`, humanize.Bytes(uint64(goMemLimit)))
22-
}
23-
24-
if err != nil {
25-
logger.Fatal(err)
26-
}
8+
system.AutoProcMemLimit(logger)
279
}

0 commit comments

Comments
 (0)