Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace the file storage logger with the default logger #311

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

refactor: replace the file storage logger with the default logger #311

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03da51d
refactor: replace logger with default logger
jinrenjie Sep 15, 2024
b36d209
typo: fix typo
jinrenjie Sep 15, 2024
44d7140
fix: avoid panic
jinrenjie Sep 16, 2024
78ab6f1
Update filestorage.go
jinrenjie Sep 19, 2024
41ee521
Merge branch 'master' into master
mholt Nov 4, 2024
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
10 changes: 4 additions & 6 deletions filestorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"fmt"
"io"
"io/fs"
"log"
"os"
"path"
"path/filepath"
Expand Down Expand Up @@ -213,7 +212,7 @@ func (s *FileStorage) Lock(ctx context.Context, name string) error {
// the previous acquirer either crashed or had some sort of failure that
// caused them to be unable to fully acquire or retain the lock, therefore
// we should treat it as if the lockfile did not exist
log.Printf("[INFO][%s] %s: Empty lockfile (%v) - likely previous process crashed or storage medium failure; treating as stale", s, filename, err2)
Default.Logger.Sugar().Infof("[%s] %s: Empty lockfile (%v) - likely previous process crashed or storage medium failure; treating as stale", s, filename, err2)
}
} else if err2 != nil {
return fmt.Errorf("decoding lockfile contents: %w", err2)
Expand All @@ -235,8 +234,7 @@ func (s *FileStorage) Lock(ctx context.Context, name string) error {
// either have potential to cause infinite loops, as in caddyserver/caddy#4448,
// or must give up on perfect mutual exclusivity; however, these cases are rare,
// so we prefer the simpler solution that avoids infinite loops)
log.Printf("[INFO][%s] Lock for '%s' is stale (created: %s, last update: %s); removing then retrying: %s",
s, name, meta.Created, meta.Updated, filename)
Default.Logger.Sugar().Infof("[%s] Lock for '%s' is stale (created: %s, last update: %s); removing then retrying: %s", s, name, meta.Created, meta.Updated, filename)
if err = os.Remove(filename); err != nil { // hopefully we can replace the lock file quickly!
if !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("unable to delete stale lockfile; deadlocked: %w", err)
Expand Down Expand Up @@ -311,15 +309,15 @@ func keepLockfileFresh(filename string) {
if err := recover(); err != nil {
buf := make([]byte, stackTraceBufferSize)
buf = buf[:runtime.Stack(buf, false)]
log.Printf("panic: active locking: %v\n%s", err, buf)
Default.Logger.Sugar().Panicf("active locking: %v\n%s", err, buf)
jinrenjie marked this conversation as resolved.
Show resolved Hide resolved
}
}()

for {
time.Sleep(lockFreshnessInterval)
done, err := updateLockfileFreshness(filename)
if err != nil {
log.Printf("[ERROR] Keeping lock file fresh: %v - terminating lock maintenance (lockfile: %s)", err, filename)
Default.Logger.Sugar().Errorf("Keeping lock file fresh: %v - terminating lock maintenance (lockfile: %s)", err, filename)
return
}
if done {
Expand Down
Loading