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

Use %w for error wrapping in log messages across multiple files

Browse Source
This commit is contained in:
Matúš Námešný
2025-10-27 17:54:39 +01:00
parent 1814772fa2
commit 5ef0654cdd
8 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/instance/process.go
View File

@@ -143,7 +143,7 @@ func (p *process) stop() error {
// Stop the process with SIGINT if cmd exists
if p.cmd != nil && p.cmd.Process != nil {
if err := p.cmd.Process.Signal(syscall.SIGINT); err != nil {
log.Printf("Failed to send SIGINT to instance %s: %v", p.instance.Name, err)
log.Printf("Failed to send SIGINT to instance %s: %w", p.instance.Name, err)
}
}
@@ -161,7 +161,7 @@ func (p *process) stop() error {
if p.cmd != nil && p.cmd.Process != nil {
killErr := p.cmd.Process.Kill()
if killErr != nil {
log.Printf("Failed to force kill instance %s: %v", p.instance.Name, killErr)
log.Printf("Failed to force kill instance %s: %w", p.instance.Name, killErr)
}
log.Printf("Instance %s did not stop in time, force killed", p.instance.Name)
@@ -292,7 +292,7 @@ func (p *process) monitorProcess() {
// Log the exit
if err != nil {
log.Printf("Instance %s crashed with error: %v", p.instance.Name, err)
log.Printf("Instance %s crashed with error: %w", p.instance.Name, err)
// Handle auto-restart logic
p.handleAutoRestart(err)
} else {
@@ -376,7 +376,7 @@ func (p *process) handleAutoRestart(err error) {
// Restart the instance
if err := p.start(); err != nil {
log.Printf("Failed to restart instance %s: %v", p.instance.Name, err)
log.Printf("Failed to restart instance %s: %w", p.instance.Name, err)
} else {
log.Printf("Successfully restarted instance %s", p.instance.Name)
// Clear the cancel function

2
pkg/manager/lifecycle.go
View File

@@ -102,7 +102,7 @@ func (l *lifecycleManager) checkTimeouts() {
for _, name := range timeoutInstances {
log.Printf("Instance %s has timed out, stopping it", name)
if _, err := l.manager.StopInstance(name); err != nil {
log.Printf("Error stopping instance %s: %v", name, err)
log.Printf("Error stopping instance %s: %w", name, err)
} else {
log.Printf("Instance %s stopped successfully", name)
}

14
pkg/manager/manager.go
View File

@@ -56,13 +56,13 @@ func New(globalConfig *config.AppConfig) InstanceManager {
portRange := globalConfig.Instances.PortRange
ports, err := newPortAllocator(portRange[0], portRange[1])
if err != nil {
log.Fatalf("Failed to create port allocator: %v", err)
log.Fatalf("Failed to create port allocator: %w", err)
}
// Initialize persistence
persistence, err := newInstancePersister(globalConfig.Instances.InstancesDir)
if err != nil {
log.Fatalf("Failed to create instance persister: %v", err)
log.Fatalf("Failed to create instance persister: %w", err)
}
// Initialize remote manager
@@ -83,7 +83,7 @@ func New(globalConfig *config.AppConfig) InstanceManager {
// Load existing instances from disk
if err := im.loadInstances(); err != nil {
log.Printf("Error loading instances: %v", err)
log.Printf("Error loading instances: %w", err)
}
// Start the lifecycle manager
@@ -116,7 +116,7 @@ func (im *instanceManager) Shutdown() {
defer wg.Done()
fmt.Printf("Stopping instance %s...\n", inst.Name)
if err := inst.Stop(); err != nil {
fmt.Printf("Error stopping instance %s: %v\n", inst.Name, err)
fmt.Printf("Error stopping instance %s: %w\n", inst.Name, err)
}
}(inst)
}
@@ -140,7 +140,7 @@ func (im *instanceManager) loadInstances() error {
// Process each loaded instance
for _, persistedInst := range instances {
if err := im.loadInstance(persistedInst); err != nil {
log.Printf("Failed to load instance %s: %v", persistedInst.Name, err)
log.Printf("Failed to load instance %s: %w", persistedInst.Name, err)
continue
}
}
@@ -251,12 +251,12 @@ func (im *instanceManager) autoStartInstances() {
// Remote instance - use remote manager with context
ctx := context.Background()
if _, err := im.remote.startInstance(ctx, node, inst.Name); err != nil {
log.Printf("Failed to auto-start remote instance %s: %v", inst.Name, err)
log.Printf("Failed to auto-start remote instance %s: %w", inst.Name, err)
}
} else {
// Local instance - call Start() directly
if err := inst.Start(); err != nil {
log.Printf("Failed to auto-start instance %s: %v", inst.Name, err)
log.Printf("Failed to auto-start instance %s: %w", inst.Name, err)
}
}
}

8
pkg/manager/operations.go
View File

@@ -166,7 +166,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options
// Persist instance (best-effort, don't fail if persistence fails)
if err := im.persistInstance(inst); err != nil {
log.Printf("Warning: failed to persist instance %s: %v", name, err)
log.Printf("Warning: failed to persist instance %s: %w", name, err)
}
return inst, nil
@@ -394,7 +394,7 @@ func (im *instanceManager) StartInstance(name string) (*instance.Instance, error
// Persist instance (best-effort, don't fail if persistence fails)
if err := im.persistInstance(inst); err != nil {
log.Printf("Warning: failed to persist instance %s: %v", name, err)
log.Printf("Warning: failed to persist instance %s: %w", name, err)
}
return inst, nil
@@ -453,7 +453,7 @@ func (im *instanceManager) StopInstance(name string) (*instance.Instance, error)
// Persist instance (best-effort, don't fail if persistence fails)
if err := im.persistInstance(inst); err != nil {
log.Printf("Warning: failed to persist instance %s: %v", name, err)
log.Printf("Warning: failed to persist instance %s: %w", name, err)
}
return inst, nil
@@ -499,7 +499,7 @@ func (im *instanceManager) RestartInstance(name string) (*instance.Instance, err
// Persist the restarted instance
if err := im.persistInstance(inst); err != nil {
log.Printf("Warning: failed to persist instance %s: %v", name, err)
log.Printf("Warning: failed to persist instance %s: %w", name, err)
}
return inst, nil

4
pkg/manager/persistence.go
View File

@@ -162,8 +162,8 @@ func (p *instancePersister) loadAll() ([]*instance.Instance, error) {
inst, err := p.loadInstanceFile(instanceName, instancePath)
if err != nil {
log.Printf("Failed to load instance %s: %v", instanceName, err)
loadErrors = append(loadErrors, fmt.Sprintf("%s: %v", instanceName, err))
log.Printf("Failed to load instance %s: %w", instanceName, err)
loadErrors = append(loadErrors, fmt.Sprintf("%s: %w", instanceName, err))
continue
}

6
pkg/server/handlers.go
View File

@@ -25,7 +25,7 @@ func writeError(w http.ResponseWriter, status int, code, details string) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(status)
if err := json.NewEncoder(w).Encode(errorResponse{Error: code, Details: details}); err != nil {
log.Printf("Failed to encode error response: %v", err)
log.Printf("Failed to encode error response: %w", err)
}
}
@@ -34,7 +34,7 @@ func writeJSON(w http.ResponseWriter, status int, data any) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(status)
if err := json.NewEncoder(w).Encode(data); err != nil {
log.Printf("Failed to encode JSON response: %v", err)
log.Printf("Failed to encode JSON response: %w", err)
}
}
@@ -43,7 +43,7 @@ func writeText(w http.ResponseWriter, status int, data string) {
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(status)
if _, err := w.Write([]byte(data)); err != nil {
log.Printf("Failed to write text response: %v", err)
log.Printf("Failed to write text response: %w", err)
}
}

2
pkg/server/routes.go
View File

@@ -159,7 +159,7 @@ func SetupRouter(handler *Handler) *chi.Mux {
// Serve WebUI files
if err := webui.SetupWebUI(r); err != nil {
fmt.Printf("Failed to set up WebUI: %v\n", err)
fmt.Printf("Failed to set up WebUI: %w\n", err)
}
return r