From e65f4f16419e851152739067b154de03cc97de7a Mon Sep 17 00:00:00 2001 From: LordMathis Date: Mon, 27 Oct 2025 18:01:58 +0100 Subject: [PATCH] Remove unsupported error wrapping from log.Printf --- pkg/instance/process.go | 8 ++++---- pkg/manager/lifecycle.go | 2 +- pkg/manager/manager.go | 8 ++++---- pkg/manager/operations.go | 8 ++++---- pkg/manager/persistence.go | 4 ++-- pkg/server/handlers.go | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/instance/process.go b/pkg/instance/process.go index 89db565..94e057f 100644 --- a/pkg/instance/process.go +++ b/pkg/instance/process.go @@ -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: %w", p.instance.Name, err) + log.Printf("Failed to send SIGINT to instance %s: %v", 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: %w", p.instance.Name, killErr) + log.Printf("Failed to force kill instance %s: %v", 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: %w", p.instance.Name, err) + log.Printf("Instance %s crashed with error: %v", 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: %w", p.instance.Name, err) + log.Printf("Failed to restart instance %s: %v", p.instance.Name, err) } else { log.Printf("Successfully restarted instance %s", p.instance.Name) // Clear the cancel function diff --git a/pkg/manager/lifecycle.go b/pkg/manager/lifecycle.go index 7d052f1..cc147df 100644 --- a/pkg/manager/lifecycle.go +++ b/pkg/manager/lifecycle.go @@ -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: %w", name, err) + log.Printf("Error stopping instance %s: %v", name, err) } else { log.Printf("Instance %s stopped successfully", name) } diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 2ed3a2a..d72579a 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -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: %w", err) + log.Printf("Error loading instances: %v", err) } // Start the lifecycle manager @@ -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: %w", persistedInst.Name, err) + log.Printf("Failed to load instance %s: %v", 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: %w", inst.Name, err) + log.Printf("Failed to auto-start remote instance %s: %v", inst.Name, err) } } else { // Local instance - call Start() directly if err := inst.Start(); err != nil { - log.Printf("Failed to auto-start instance %s: %w", inst.Name, err) + log.Printf("Failed to auto-start instance %s: %v", inst.Name, err) } } } diff --git a/pkg/manager/operations.go b/pkg/manager/operations.go index a94e2e5..14b86a7 100644 --- a/pkg/manager/operations.go +++ b/pkg/manager/operations.go @@ -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: %w", name, err) + log.Printf("Warning: failed to persist instance %s: %v", 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: %w", name, err) + log.Printf("Warning: failed to persist instance %s: %v", 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: %w", name, err) + log.Printf("Warning: failed to persist instance %s: %v", 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: %w", name, err) + log.Printf("Warning: failed to persist instance %s: %v", name, err) } return inst, nil diff --git a/pkg/manager/persistence.go b/pkg/manager/persistence.go index 8bad44f..01fe11f 100644 --- a/pkg/manager/persistence.go +++ b/pkg/manager/persistence.go @@ -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: %w", instanceName, err) - loadErrors = append(loadErrors, fmt.Sprintf("%s: %w", instanceName, err)) + log.Printf("Failed to load instance %s: %v", instanceName, err) + loadErrors = append(loadErrors, fmt.Sprintf("%s: %v", instanceName, err)) continue } diff --git a/pkg/server/handlers.go b/pkg/server/handlers.go index 390c130..78b83c5 100644 --- a/pkg/server/handlers.go +++ b/pkg/server/handlers.go @@ -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: %w", err) + log.Printf("Failed to encode error response: %v", 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: %w", err) + log.Printf("Failed to encode JSON response: %v", 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: %w", err) + log.Printf("Failed to write text response: %v", err) } }