From 46c8fc64fddc30703a88ccc943e0535b0f3ef78e Mon Sep 17 00:00:00 2001 From: Andrew Ayer Date: Mon, 19 May 2025 13:24:51 -0400 Subject: [PATCH] Improve verbose logging --- monitor/daemon.go | 2 +- monitor/monitor.go | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/monitor/daemon.go b/monitor/daemon.go index ddf20fd..a2821ca 100644 --- a/monitor/daemon.go +++ b/monitor/daemon.go @@ -75,7 +75,7 @@ func (daemon *daemon) startTask(ctx context.Context, ctlog *loglist.Log) task { defer cancel() err := monitorLogContinously(ctx, daemon.config, ctlog) if daemon.config.Verbose { - log.Printf("task for log %s stopped with error %s", ctlog.GetMonitoringURL(), err) + log.Printf("%s: task stopped with error: %s", ctlog.GetMonitoringURL(), err) } if ctx.Err() == context.Canceled && errors.Is(err, context.Canceled) { return nil diff --git a/monitor/monitor.go b/monitor/monitor.go index 705026e..04abd0d 100644 --- a/monitor/monitor.go +++ b/monitor/monitor.go @@ -246,17 +246,18 @@ func monitorLogContinously(ctx context.Context, config *Config, ctlog *loglist.L } } if config.Verbose { - log.Printf("brand new log %s (starting from %d)", ctlog.GetMonitoringURL(), state.DownloadPosition.Size()) + log.Printf("%s: monitoring brand new log starting from position %d", ctlog.GetMonitoringURL(), state.DownloadPosition.Size()) } if err := config.State.StoreLogState(ctx, ctlog.LogID, state); err != nil { return fmt.Errorf("error storing log state: %w", err) } + } else { + if config.Verbose { + log.Printf("%s: resuming monitoring from position %d", ctlog.GetMonitoringURL(), state.DownloadPosition.Size()) + } } defer func() { - if config.Verbose { - log.Printf("saving state in defer for %s", ctlog.GetMonitoringURL()) - } storeCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second) defer cancel() if err := config.State.StoreLogState(storeCtx, ctlog.LogID, state); err != nil && returnedErr == nil { @@ -503,6 +504,9 @@ func saveStateWorker(ctx context.Context, config *Config, ctlog *loglist.Log, st if err := config.State.RemoveSTH(ctx, ctlog.LogID, &sth.SignedTreeHead); err != nil { return fmt.Errorf("error removing verified STH: %w", err) } + if config.Verbose { + log.Printf("%s: verified position is now %d", ctlog.GetMonitoringURL(), sth.SignedTreeHead.TreeSize) + } } if len(batch.entries) == 0 { break