From 1631c72f706e7ffcb14f9682a2f8c0a87c22fcac Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 9 Jan 2025 20:42:18 -0600 Subject: [PATCH] don't use STDERR anymore. also timestamps off by default Signed-off-by: Jeff Carr --- flags.go | 1 + reallog.go | 29 ++++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/flags.go b/flags.go index 927ccb5..ce99aa8 100644 --- a/flags.go +++ b/flags.go @@ -56,6 +56,7 @@ type LogFlag struct { var flags []*LogFlag var daemonMode bool +var timestamps bool = false var httpMode http.ResponseWriter func init() { diff --git a/reallog.go b/reallog.go index 9962329..249a03f 100644 --- a/reallog.go +++ b/reallog.go @@ -15,6 +15,11 @@ func DaemonMode(b bool) { daemonMode = b } +func Timestamps(b bool) { + timestamps = b +} + + var captureMode io.Writer func CaptureMode(w io.Writer) { @@ -59,15 +64,22 @@ func realPrintln(a ...any) { } else { // put timestamps on each line if captureMode == nil { + if timestamps { reallog.Println(a...) + } else { + fmt.Println(a...) + } } else { // TODO: add datestamp fmt.Fprintln(captureMode, a...) } } if httpMode != nil { - now := time.Now() - timestamp := now.Format("2006/01/02 15:04:05") // bummer. other date doesn't work? + var timestamp string + if timestamps { + now := time.Now() + timestamp = now.Format("2006/01/02 15:04:05") // todo: fix GO so Nov 5 1955 works here + } s := timestamp + " " + fmt.Sprint(a...) fmt.Fprintln(httpMode, s) if flusher != nil { @@ -87,14 +99,21 @@ func realPrintf(s string, a ...any) { } else { // put timestamps on each line if captureMode == nil { - reallog.Printf(s, a...) + if timestamps { + reallog.Printf(s, a...) + } else { + fmt.Printf(s, a...) + } } else { fmt.Fprintf(captureMode, s, a...) } } if httpMode != nil { - now := time.Now() - timestamp := now.Format("2006/01/02 15:04:05") // bummer. other date doesn't work? + var timestamp string + if timestamps { + now := time.Now() + timestamp = now.Format("2006/01/02 15:04:05") + } s := timestamp + " " + fmt.Sprintf(s, a...) fmt.Fprintln(httpMode, s) if flusher != nil {