Skip to content
This repository was archived by the owner on Sep 10, 2025. It is now read-only.

Update the log-levels of some messages #144

Merged
skx merged 3 commits into from
Jun 6, 2025
Merged

Update the log-levels of some messages #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6696bc8
Change some Warn logs to Debug to reduce default-noise.
skx Jun 6, 2025
9d7db2d
Upgrade errors to errors
skx Jun 6, 2025
026628b
Another couple of updates
skx Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (d *daemonCmd) Execute(args []string) int {
// Default time to sleep - in minutes
n := 5

logger.Warn("sleeping before polling feeds again",
logger.Debug("sleeping before polling feeds again",
slog.Int("delay.minutes", n))

time.Sleep(time.Duration(n) * time.Minute)
Expand Down
4 changes: 2 additions & 2 deletions import_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ func (i *importCmd) Execute(args []string) int {
var data []byte
data, err = os.ReadFile(file)
if err != nil {
logger.Warn("failed to read file", slog.String("file", file), slog.String("error", err.Error()))
logger.Error("failed to read file", slog.String("file", file), slog.String("error", err.Error()))
continue
}

// Parse
o := opml{}
err = xml.Unmarshal(data, &o)
if err != nil {
logger.Warn("failed to parse XML file", slog.String("file", file), slog.String("error", err.Error()))
logger.Error("failed to parse XML file", slog.String("file", file), slog.String("error", err.Error()))
continue
}

Expand Down
16 changes: 8 additions & 8 deletions processor/emailer/emailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (e *Emailer) Sendmail(addresses []string, textstr string, htmlstr string) e
err := e.sendSMTP(addr, buf.Bytes())
if err != nil {

e.logger.Warn("error sending email",
e.logger.Error("error sending email",
slog.String("recipient", addr),
slog.String("method", "smtp"),
slog.String("error", err.Error()))
Expand All @@ -283,7 +283,7 @@ func (e *Emailer) Sendmail(addresses []string, textstr string, htmlstr string) e

err := e.sendSendmail(addr, buf.Bytes())
if err != nil {
e.logger.Warn("error sending email",
e.logger.Error("error sending email",
slog.String("recipient", addr),
slog.String("method", "sendmail"),
slog.String("error", err.Error()))
Expand Down Expand Up @@ -369,7 +369,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
stdin, err := sendmail.StdinPipe()
if err != nil {

e.logger.Warn("error creating STDIN pipe to sendmail",
e.logger.Error("error creating STDIN pipe to sendmail",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand All @@ -382,7 +382,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
stdout, err := sendmail.StdoutPipe()
if err != nil {

e.logger.Warn("error creating STDOUT pipe to sendmail",
e.logger.Error("error creating STDOUT pipe to sendmail",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand All @@ -395,7 +395,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
err = sendmail.Start()
if err != nil {

e.logger.Warn("error starting sendmail",
e.logger.Error("error starting sendmail",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand All @@ -404,7 +404,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
_, err = stdin.Write(content)
if err != nil {

e.logger.Warn("error writing to sendmail pipe",
e.logger.Error("error writing to sendmail pipe",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand All @@ -418,7 +418,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
_, err = io.ReadAll(stdout)
if err != nil {

e.logger.Warn("error reading from sendmail pipe",
e.logger.Error("error reading from sendmail pipe",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand All @@ -431,7 +431,7 @@ func (e *Emailer) sendSendmail(addr string, content []byte) error {
err = sendmail.Wait()
if err != nil {

e.logger.Warn("error awaiting sendmail completion",
e.logger.Error("error awaiting sendmail completion",
slog.String("recipient", addr),
slog.String("error", err.Error()))

Expand Down
26 changes: 13 additions & 13 deletions processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (p *Processor) ProcessFeeds(recipients []string) []error {
// If we're supposed to sleep, do so
if sleep != 0 {

p.logger.Warn("sleeping",
p.logger.Debug("sleeping",
slog.Int("sleep", sleep))

time.Sleep(time.Duration(sleep) * time.Second)
Expand Down Expand Up @@ -279,11 +279,11 @@ func (p *Processor) processFeed(entry configfile.Feed, recipients []string) erro
if err != nil {

if err == httpfetch.ErrUnchanged {
logger.Warn("remote feed unchanged, skipping")
logger.Debug("remote feed unchanged, skipping")
return nil
}

logger.Warn("failed to fetch feed",
logger.Error("failed to fetch feed",
slog.String("error", err.Error()))
return err
}
Expand Down Expand Up @@ -415,7 +415,7 @@ func (p *Processor) processFeed(entry configfile.Feed, recipients []string) erro
err = helper.Sendmail(recipients, text, content)
if err != nil {

logger.Warn("failed to send email",
logger.Error("failed to send email",
slog.String("recipients", strings.Join(recipients, ",")),
slog.String("error", err.Error()))

Expand All @@ -437,7 +437,7 @@ func (p *Processor) processFeed(entry configfile.Feed, recipients []string) erro
// due to error, and that keeps happening forever...
err = p.recordItem(entry.URL, item.Link)
if err != nil {
logger.Warn("failed to mark item as processed",
logger.Error("failed to mark item as processed",
slog.String("error", err.Error()))
return err
}
Expand All @@ -451,7 +451,7 @@ func (p *Processor) processFeed(entry configfile.Feed, recipients []string) erro
err = p.pruneFeed(entry.URL, items)
if err != nil {

logger.Warn("failed to prune bolddb",
logger.Error("failed to prune bolddb",
slog.String("error", err.Error()))

return fmt.Errorf("error pruning boltdb for %s: %s", entry.URL, err)
Expand Down Expand Up @@ -479,7 +479,7 @@ func (p *Processor) seenItem(feed string, entry string) bool {
return nil
})
if err != nil {
p.logger.Warn("error checking state of item",
p.logger.Error("error checking state of item",
slog.String("feed", feed),
slog.String("item", entry),
slog.String("error", err.Error()))
Expand All @@ -504,7 +504,7 @@ func (p *Processor) recordItem(feed string, entry string) error {
})

if err != nil {
p.logger.Warn("error recording state of item",
p.logger.Error("error recording state of item",
slog.String("feed", feed),
slog.String("item", entry),
slog.String("error", err.Error()))
Expand Down Expand Up @@ -562,7 +562,7 @@ func (p *Processor) pruneFeed(feed string, items []string) error {

if err != nil {

p.logger.Warn("error getting all bucket keys",
p.logger.Error("error getting all bucket keys",
slog.String("error", err.Error()))
return err
}
Expand All @@ -580,7 +580,7 @@ func (p *Processor) pruneFeed(feed string, items []string) error {
})
if err != nil {

p.logger.Warn("error deleting key from bucket",
p.logger.Error("error deleting key from bucket",
slog.String("entry", ent),
slog.String("error", err.Error()))

Expand Down Expand Up @@ -626,7 +626,7 @@ func (p *Processor) pruneUnknownFeeds(feeds []string) error {
})

if err != nil {
p.logger.Warn("error finding orphaned buckets",
p.logger.Error("error finding orphaned buckets",
slog.String("error", err.Error()))

return err
Expand All @@ -648,7 +648,7 @@ func (p *Processor) pruneUnknownFeeds(feeds []string) error {
err := b.Delete(k)
if err != nil {

p.logger.Warn("error removing key from bucket",
p.logger.Error("error removing key from bucket",
slog.String("bucket", bucket),
slog.String("key", string(k)),
slog.String("error", err.Error()))
Expand All @@ -660,7 +660,7 @@ func (p *Processor) pruneUnknownFeeds(feeds []string) error {
// Now delete the bucket itself
err := tx.DeleteBucket([]byte(bucket))
if err != nil {
p.logger.Warn("error removing bucket",
p.logger.Error("error removing bucket",
slog.String("bucket", bucket),
slog.String("error", err.Error()))
return fmt.Errorf("failed to remove bucket %s: %s", bucket, err)
Expand Down
Loading