ref: export memory stats to logger package

thoas · Sep 25, 2023 · 1dd240d · 1dd240d
1 parent 4281140
commit 1dd240d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 26 deletions.
diff --git a/logger/logger.go b/logger/logger.go
@@ -2,8 +2,10 @@ package logger
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"os"
+	"runtime"
 	"strings"
 )
 
@@ -76,3 +78,22 @@ func New(cfg Config) *slog.Logger {
 	})
 
 }
+
+func LogMemStats(ctx context.Context, msg string, logger *slog.Logger) {
+	var m runtime.MemStats
+	runtime.ReadMemStats(&m)
+
+	attributes := []slog.Attr{
+		slog.String("alloc", fmt.Sprintf("%v MiB", bToMb(m.Alloc))),
+		slog.String("heap-alloc", fmt.Sprintf("%v MiB", bToMb(m.HeapAlloc))),
+		slog.String("total-alloc", fmt.Sprintf("%v MiB", bToMb(m.TotalAlloc))),
+		slog.String("sys", fmt.Sprintf("%v MiB", bToMb(m.Sys))),
+		slog.Int("numgc", int(m.NumGC)),
+		slog.Int("total-goroutine", runtime.NumGoroutine()),
+	}
+	logger.LogAttrs(ctx, slog.LevelInfo, msg, attributes...)
+}
+
+func bToMb(b uint64) uint64 {
+	return b / 1024 / 1024
+}
diff --git a/middleware/log.go b/middleware/log.go
@@ -2,15 +2,14 @@ package middleware
 
 import (
 	"context"
-	"fmt"
 	"log/slog"
-	"runtime"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/thoas/picfit/config"
 	"github.com/thoas/picfit/constants"
+	loggerpkg "github.com/thoas/picfit/logger"
 )
 
 func NewLogger(cfg *config.Config, logger *slog.Logger) gin.HandlerFunc {
@@ -48,25 +47,6 @@ func NewLogger(cfg *config.Config, logger *slog.Logger) gin.HandlerFunc {
 			logger.LogAttrs(ctx, slog.LevelInfo, path, attributes...)
 		}
 
-		logMemStats(ctx, logger)
+		loggerpkg.LogMemStats(ctx, "Memory stats", logger)
 	}
 }
-
-func logMemStats(ctx context.Context, logger *slog.Logger) {
-	var m runtime.MemStats
-	runtime.ReadMemStats(&m)
-
-	attributes := []slog.Attr{
-		slog.String("alloc", fmt.Sprintf("%v MiB", bToMb(m.Alloc))),
-		slog.String("heap-alloc", fmt.Sprintf("%v MiB", bToMb(m.HeapAlloc))),
-		slog.String("total-alloc", fmt.Sprintf("%v MiB", bToMb(m.TotalAlloc))),
-		slog.String("sys", fmt.Sprintf("%v MiB", bToMb(m.Sys))),
-		slog.Int("numgc", int(m.NumGC)),
-		slog.Int("total-goroutine", runtime.NumGoroutine()),
-	}
-	logger.LogAttrs(ctx, slog.LevelInfo, "Memory stats", attributes...)
-}
-
-func bToMb(b uint64) uint64 {
-	return b / 1024 / 1024
-}
diff --git a/server/server.go b/server/server.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/thoas/picfit"
 	"github.com/thoas/picfit/config"
+	loggerpkg "github.com/thoas/picfit/logger"
 )
 
 func New(ctx context.Context, cfg *config.Config) (*HTTPServer, error) {
@@ -38,15 +39,15 @@ func Run(ctx context.Context, path string) error {
 	}
 	ctx, stop := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
-	if err := server.Run(ctx); err != nil {
-		return err
-	}
-
 	go func() {
 		for range time.Tick(time.Duration(cfg.Options.FreeMemoryInterval) * time.Second) {
+			loggerpkg.LogMemStats(ctx, "Force free memory", server.processor.Logger)
 			debug.FreeOSMemory()
 		}
 	}()
+	if err := server.Run(ctx); err != nil {
+		return err
+	}
 
 	select { // nolint:gosimple
 	case <-ctx.Done():