Merge pull request #1828 from liuy/feat/logging-config
feat(logger): add PICOCLAW_LOG_FILE env var for file-only logging
This commit is contained in:
commit
664e23e4fb
3 changed files with 66 additions and 0 deletions
|
|
@ -28,6 +28,8 @@ func agentCmd(message, sessionKey, model string, debug bool) error {
|
||||||
return fmt.Errorf("error loading config: %w", err)
|
return fmt.Errorf("error loading config: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.ConfigureFromEnv()
|
||||||
|
|
||||||
if debug {
|
if debug {
|
||||||
logger.SetLevel(logger.DEBUG)
|
logger.SetLevel(logger.DEBUG)
|
||||||
fmt.Println("🔍 Debug mode enabled")
|
fmt.Println("🔍 Debug mode enabled")
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package logger
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
@ -100,6 +101,12 @@ func SetConsoleLevel(level LogLevel) {
|
||||||
logger = logger.Level(level)
|
logger = logger.Level(level)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func DisableConsole() {
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
logger = zerolog.New(io.Discard).With().Timestamp().Caller().Logger()
|
||||||
|
}
|
||||||
|
|
||||||
func GetLevel() LogLevel {
|
func GetLevel() LogLevel {
|
||||||
mu.RLock()
|
mu.RLock()
|
||||||
defer mu.RUnlock()
|
defer mu.RUnlock()
|
||||||
|
|
@ -170,6 +177,22 @@ func DisableFileLogging() {
|
||||||
fileLogger = zerolog.Logger{}
|
fileLogger = zerolog.Logger{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ConfigureFromEnv() {
|
||||||
|
if logFile := os.Getenv("PICOCLAW_LOG_FILE"); logFile != "" {
|
||||||
|
if strings.HasPrefix(logFile, "~/") {
|
||||||
|
if home := os.Getenv("HOME"); home != "" {
|
||||||
|
logFile = filepath.Join(home, logFile[2:])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := EnableFileLogging(logFile); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "failed to enable file logging: %v\n", err)
|
||||||
|
} else {
|
||||||
|
DisableConsole()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func getCallerSkip() int {
|
func getCallerSkip() int {
|
||||||
for i := 2; i < 15; i++ {
|
for i := 2; i < 15; i++ {
|
||||||
pc, file, _, ok := runtime.Caller(i)
|
pc, file, _, ok := runtime.Caller(i)
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,11 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
)
|
)
|
||||||
|
|
@ -365,3 +369,40 @@ func TestAppendFields_ErrorUsesErrorString(t *testing.T) {
|
||||||
t.Fatalf("error field = %#v, want %q", got["error"], "transcription request failed")
|
t.Fatalf("error field = %#v, want %q", got["error"], "transcription request failed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDisableConsole(t *testing.T) {
|
||||||
|
DisableConsole()
|
||||||
|
Info("this should go to nowhere")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigureFromEnv(t *testing.T) {
|
||||||
|
home := os.Getenv("HOME")
|
||||||
|
if home == "" {
|
||||||
|
t.Skip("HOME not set")
|
||||||
|
}
|
||||||
|
|
||||||
|
tmpFile := "/tmp/picoclaw_test_log_" + fmt.Sprintf("%d", time.Now().UnixNano())
|
||||||
|
defer os.Remove(tmpFile)
|
||||||
|
|
||||||
|
os.Setenv("PICOCLAW_LOG_FILE", tmpFile)
|
||||||
|
defer os.Unsetenv("PICOCLAW_LOG_FILE")
|
||||||
|
|
||||||
|
ConfigureFromEnv()
|
||||||
|
|
||||||
|
if logFile == nil {
|
||||||
|
t.Error("expected log file to be set")
|
||||||
|
}
|
||||||
|
|
||||||
|
Info("test message")
|
||||||
|
|
||||||
|
os.Setenv("PICOCLAW_LOG_FILE", "~/test_log")
|
||||||
|
ConfigureFromEnv()
|
||||||
|
|
||||||
|
expanded := filepath.Join(home, "test_log")
|
||||||
|
defer os.Remove(expanded)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigureFromEnvNoEnv(t *testing.T) {
|
||||||
|
os.Unsetenv("PICOCLAW_LOG_FILE")
|
||||||
|
ConfigureFromEnv()
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue