From 406a7116825e30c0beeef3f1b54cc6ba0686fbf8 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Sat, 13 Dec 2025 12:34:29 +0100 Subject: [PATCH] Move LogRotationConfig to logger package --- pkg/config/config.go | 7 ------- pkg/instance/instance.go | 5 +++-- pkg/instance/logger.go | 12 +++++++++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/config/config.go b/pkg/config/config.go index fdb5e30..c1a94de 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -88,13 +88,6 @@ type DatabaseConfig struct { ConnMaxLifetime time.Duration `yaml:"connection_max_lifetime" json:"connection_max_lifetime" swaggertype:"string" example:"1h"` } -// LogRotationConfig contains log rotation settings for instances -type LogRotationConfig struct { - Enabled bool `yaml:"enabled" default:"true"` - MaxSizeMB int `yaml:"max_size_mb" default:"100"` // MB - Compress bool `yaml:"compress" default:"false"` -} - // InstancesConfig contains instance management configuration type InstancesConfig struct { // Port range for instances (e.g., 8000,9000) diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index d2e9d8d..6a26d79 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -3,10 +3,11 @@ package instance import ( "encoding/json" "fmt" - "llamactl/pkg/config" "log" "net/http" "time" + + "llamactl/pkg/config" ) // Instance represents a running instance of llama server @@ -68,7 +69,7 @@ func New(name string, globalConfig *config.AppConfig, opts *Options, onStatusCha // Only create logger, proxy, and process for local instances if !instance.IsRemote() { - logRotationConfig := &config.LogRotationConfig{ + logRotationConfig := &LogRotationConfig{ Enabled: globalInstanceSettings.LogRotationEnabled, MaxSizeMB: globalInstanceSettings.LogRotationMaxSizeMB, Compress: globalInstanceSettings.LogRotationCompress, diff --git a/pkg/instance/logger.go b/pkg/instance/logger.go index ef754a6..7b00389 100644 --- a/pkg/instance/logger.go +++ b/pkg/instance/logger.go @@ -10,19 +10,25 @@ import ( "time" timber "github.com/DeRuina/timberjack" - "llamactl/pkg/config" ) +// LogRotationConfig contains log rotation settings for instances +type LogRotationConfig struct { + Enabled bool `yaml:"enabled" default:"true"` + MaxSizeMB int `yaml:"max_size_mb" default:"100"` // MB + Compress bool `yaml:"compress" default:"false"` +} + type logger struct { name string logDir string logFile *timber.Logger logFilePath string mu sync.RWMutex - cfg *config.LogRotationConfig + cfg *LogRotationConfig } -func newLogger(name, logDir string, cfg *config.LogRotationConfig) *logger { +func newLogger(name, logDir string, cfg *LogRotationConfig) *logger { return &logger{ name: name, logDir: logDir,