Merge pull request #10433 from 2403905/issue-10427

set the memlimit default loglevel to error
owncloud · Oct 29, 2024 · f86b5e3 · f86b5e3
2 parents 753ffa6 + b4f3302
commit f86b5e3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-memlimit-loglevel.md b/changelog/unreleased/fix-memlimit-loglevel.md
@@ -0,0 +1,6 @@
+Bugfix: Fix the memlimit loglevel
+
+We set the memlimit default loglevel to error.
+
+https://github.com/owncloud/ocis/pull/10431  
+https://github.com/owncloud/ocis/issues/10428
diff --git a/ocis-pkg/shared/memlimit.go b/ocis-pkg/shared/memlimit.go
@@ -1,6 +1,15 @@
 package shared
 
 import (
-	// we import automemlimit here to include it for ocis als well as individual service binaries
-	_ "github.com/KimMachineGun/automemlimit"
+	"log/slog"
+
+	"github.com/KimMachineGun/automemlimit/memlimit"
 )
+
+// we init the memlimit here to include it for ocis als well as individual service binaries
+func init() {
+	slog.SetLogLoggerLevel(slog.LevelError)
+	_, _ = memlimit.SetGoMemLimitWithOpts(
+		memlimit.WithLogger(slog.Default()),
+	)
+}