From b4f330278e411ece6e043d6a2671ee725ab9cf65 Mon Sep 17 00:00:00 2001 From: Roman Perekhod Date: Mon, 28 Oct 2024 22:31:14 +0100 Subject: [PATCH] set the memlimit default loglevel to error --- changelog/unreleased/fix-memlimit-loglevel.md | 6 ++++++ ocis-pkg/shared/memlimit.go | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/fix-memlimit-loglevel.md diff --git a/changelog/unreleased/fix-memlimit-loglevel.md b/changelog/unreleased/fix-memlimit-loglevel.md new file mode 100644 index 00000000000..22c58f06d12 --- /dev/null +++ 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 index 5d3b2c8f753..146838d68e1 100644 --- 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()), + ) +}