mirror of
https://github.com/sipeed/picoclaw.git
synced 2026-06-12 18:08:54 +00:00
refactor: replace log.Printf/fmt.Printf with structured logger
Replace raw log.Printf and fmt.Printf calls in pkg/state, pkg/agent, and pkg/tools with structured logger calls (WarnCF/InfoCF). This ensures warnings and info messages are routed through the configured logging infrastructure instead of raw stderr/stdout.
This commit is contained in:
@@ -2,7 +2,6 @@ package agent
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
@@ -414,7 +413,10 @@ func compilePatterns(patterns []string) []*regexp.Regexp {
|
||||
for _, p := range patterns {
|
||||
re, err := regexp.Compile(p)
|
||||
if err != nil {
|
||||
fmt.Printf("Warning: invalid path pattern %q: %v\n", p, err)
|
||||
logger.WarnCF("agent", "invalid path pattern in compilePatterns", map[string]any{
|
||||
"pattern": p,
|
||||
"error": err.Error(),
|
||||
})
|
||||
continue
|
||||
}
|
||||
compiled = append(compiled, re)
|
||||
|
||||
+15
-5
@@ -3,13 +3,13 @@ package state
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/sipeed/picoclaw/pkg/fileutil"
|
||||
"github.com/sipeed/picoclaw/pkg/logger"
|
||||
)
|
||||
|
||||
// State represents the persistent state for a workspace.
|
||||
@@ -41,7 +41,10 @@ func NewManager(workspace string) *Manager {
|
||||
|
||||
// Create state directory if it doesn't exist
|
||||
if err := os.MkdirAll(stateDir, 0o700); err != nil {
|
||||
log.Printf("[WARN] state: failed to create state directory %s: %v", stateDir, err)
|
||||
logger.WarnCF("state", "failed to create state directory", map[string]any{
|
||||
"dir": stateDir,
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
sm := &Manager{
|
||||
@@ -57,15 +60,22 @@ func NewManager(workspace string) *Manager {
|
||||
if err := json.Unmarshal(data, sm.state); err == nil {
|
||||
// Migrate to new location
|
||||
if err := sm.saveAtomic(); err != nil {
|
||||
log.Printf("[WARN] state: failed to save state: %v", err)
|
||||
logger.WarnCF("state", "failed to save state", map[string]any{
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
log.Printf("[INFO] state: migrated state from %s to %s", oldStateFile, stateFile)
|
||||
logger.InfoCF("state", "migrated state", map[string]any{
|
||||
"from": oldStateFile,
|
||||
"to": stateFile,
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Load from new location
|
||||
if err := sm.load(); err != nil {
|
||||
log.Printf("[WARN] state: failed to load state: %v", err)
|
||||
logger.WarnCF("state", "failed to load state", map[string]any{
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-2
@@ -21,6 +21,7 @@ import (
|
||||
"github.com/sipeed/picoclaw/pkg/config"
|
||||
"github.com/sipeed/picoclaw/pkg/constants"
|
||||
"github.com/sipeed/picoclaw/pkg/isolation"
|
||||
"github.com/sipeed/picoclaw/pkg/logger"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -162,7 +163,9 @@ func NewExecToolWithConfig(
|
||||
denyPatterns = append(denyPatterns, windowsDenyPatterns...)
|
||||
}
|
||||
if len(execConfig.CustomDenyPatterns) > 0 {
|
||||
fmt.Printf("Using custom deny patterns: %v\n", execConfig.CustomDenyPatterns)
|
||||
logger.InfoCF("tools", "using custom deny patterns", map[string]any{
|
||||
"patterns": execConfig.CustomDenyPatterns,
|
||||
})
|
||||
for _, pattern := range execConfig.CustomDenyPatterns {
|
||||
re, err := regexp.Compile(pattern)
|
||||
if err != nil {
|
||||
@@ -173,7 +176,7 @@ func NewExecToolWithConfig(
|
||||
}
|
||||
} else {
|
||||
// If deny patterns are disabled, we won't add any patterns, allowing all commands.
|
||||
fmt.Println("Warning: deny patterns are disabled. All commands will be allowed.")
|
||||
logger.WarnCF("tools", "deny patterns are disabled, all commands will be allowed", nil)
|
||||
}
|
||||
for _, pattern := range execConfig.CustomAllowPatterns {
|
||||
re, err := regexp.Compile(pattern)
|
||||
|
||||
Reference in New Issue
Block a user