Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-11-06 00:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor instance options handling: separate validation and default application

Browse Source
This commit is contained in:
Matúš Námešný
2025-07-23 17:16:13 +02:00
parent 63f77d8d9a
commit 57c0a1d1ef
1 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
server/pkg/instance.go
View File

@@ -54,10 +54,11 @@ type Instance struct {
restartCancel context.CancelFunc `json:"-"` // Cancel function for pending restarts restartCancel context.CancelFunc `json:"-"` // Cancel function for pending restarts
} }
// NewInstance creates a new instance with the given name, log path, and options // validateAndCopyOptions validates and creates a deep copy of the provided options
func NewInstance(name string, globalSettings *InstancesConfig, options *CreateInstanceOptions) *Instance { // It applies validation rules and returns a safe copy
// Make a deep copy of options to avoid modifying the original and to prevent data races func validateAndCopyOptions(name string, options *CreateInstanceOptions) *CreateInstanceOptions {
optionsCopy := &CreateInstanceOptions{} optionsCopy := &CreateInstanceOptions{}
if options != nil { if options != nil {
// Copy the embedded LlamaServerOptions // Copy the embedded LlamaServerOptions
optionsCopy.LlamaServerOptions = options.LlamaServerOptions optionsCopy.LlamaServerOptions = options.LlamaServerOptions
@@ -67,6 +68,7 @@ func NewInstance(name string, globalSettings *InstancesConfig, options *CreateIn
autoRestart := *options.AutoRestart autoRestart := *options.AutoRestart
optionsCopy.AutoRestart = &autoRestart optionsCopy.AutoRestart = &autoRestart
} }
if options.MaxRestarts != nil { if options.MaxRestarts != nil {
maxRestarts := *options.MaxRestarts maxRestarts := *options.MaxRestarts
if maxRestarts > 100 { if maxRestarts > 100 {
@@ -78,6 +80,7 @@ func NewInstance(name string, globalSettings *InstancesConfig, options *CreateIn
} }
optionsCopy.MaxRestarts = &maxRestarts optionsCopy.MaxRestarts = &maxRestarts
} }
if options.RestartDelay != nil { if options.RestartDelay != nil {
restartDelay := *options.RestartDelay restartDelay := *options.RestartDelay
if restartDelay < 1 { if restartDelay < 1 {
@@ -91,19 +94,35 @@ func NewInstance(name string, globalSettings *InstancesConfig, options *CreateIn
} }
} }
// Set defaults for restart options if not provided return optionsCopy
if optionsCopy.AutoRestart == nil { }
// applyDefaultOptions applies default values from global settings to any nil options
func applyDefaultOptions(options *CreateInstanceOptions, globalSettings *InstancesConfig) {
if globalSettings == nil {
return
}
if options.AutoRestart == nil {
defaultAutoRestart := globalSettings.DefaultAutoRestart defaultAutoRestart := globalSettings.DefaultAutoRestart
optionsCopy.AutoRestart = &defaultAutoRestart options.AutoRestart = &defaultAutoRestart
} }
if optionsCopy.MaxRestarts == nil { if options.MaxRestarts == nil {
defaultMaxRestarts := globalSettings.DefaultMaxRestarts defaultMaxRestarts := globalSettings.DefaultMaxRestarts
optionsCopy.MaxRestarts = &defaultMaxRestarts options.MaxRestarts = &defaultMaxRestarts
} }
if optionsCopy.RestartDelay == nil { if options.RestartDelay == nil {
defaultRestartDelay := globalSettings.DefaultRestartDelay defaultRestartDelay := globalSettings.DefaultRestartDelay
optionsCopy.RestartDelay = &defaultRestartDelay options.RestartDelay = &defaultRestartDelay
} }
}
// NewInstance creates a new instance with the given name, log path, and options
func NewInstance(name string, globalSettings *InstancesConfig, options *CreateInstanceOptions) *Instance {
// Validate and copy options
optionsCopy := validateAndCopyOptions(name, options)
// Apply defaults
applyDefaultOptions(optionsCopy, globalSettings)
return &Instance{ return &Instance{
Name: name, Name: name,
@@ -155,23 +174,8 @@ func (i *Instance) SetOptions(options *CreateInstanceOptions) {
return return
} }
// Make a deep copy to avoid sharing references // Validate and copy options without applying defaults
optionsCopy := &CreateInstanceOptions{} optionsCopy := validateAndCopyOptions(i.Name, options)
optionsCopy.LlamaServerOptions = options.LlamaServerOptions
// Copy pointer fields (validation already done in UnmarshalJSON)
if options.AutoRestart != nil {
autoRestart := *options.AutoRestart
optionsCopy.AutoRestart = &autoRestart
}
if options.MaxRestarts != nil {
maxRestarts := *options.MaxRestarts
optionsCopy.MaxRestarts = &maxRestarts
}
if options.RestartDelay != nil {
restartDelay := *options.RestartDelay
optionsCopy.RestartDelay = &restartDelay
}
i.options = optionsCopy i.options = optionsCopy
// Clear the proxy so it gets recreated with new options // Clear the proxy so it gets recreated with new options
@@ -508,26 +512,9 @@ func (i *Instance) UnmarshalJSON(data []byte) error {
i.Name = temp.Name i.Name = temp.Name
i.Running = temp.Running i.Running = temp.Running
// Handle options with validation // Handle options with validation but no defaults
if temp.Options != nil { if temp.Options != nil {
// Validate and sanitize restart parameters i.options = validateAndCopyOptions(i.Name, temp.Options)
if temp.Options.MaxRestarts != nil {
if *temp.Options.MaxRestarts < 0 {
log.Printf("Instance %s MaxRestarts value (%d) cannot be negative, setting to 0", i.Name, *temp.Options.MaxRestarts)
maxRestarts := 0
temp.Options.MaxRestarts = &maxRestarts
}
}
if temp.Options.RestartDelay != nil {
if *temp.Options.RestartDelay < 0 {
log.Printf("Instance %s RestartDelay value (%d) cannot be negative, setting to 0", i.Name, *temp.Options.RestartDelay)
restartDelay := 5
temp.Options.RestartDelay = &restartDelay
}
}
i.options = temp.Options
} }
return nil return nil