diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-10-21 20:47:02 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-10-21 20:47:02 +0900 |
| commit | 42e0b168e3d75389dfb968aebf9f5629d64782f9 (patch) | |
| tree | e6b430205213c62bc06275c6d84e6037d40f5c3f /internal/system/tmpfiles.go | |
| parent | 380d1f45851b7dffb963c51da96a17ba41f3cfb8 (diff) | |
fmsg: produce all output through fmsg
The behaviour of print functions from package fmt is not thread safe. Functions provided by fmsg wrap around Logger methods. This makes prefix much cleaner and makes it easy to deal with future changes to logging.
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'internal/system/tmpfiles.go')
| -rw-r--r-- | internal/system/tmpfiles.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/internal/system/tmpfiles.go b/internal/system/tmpfiles.go index 7b23e0e6..9215bd33 100644 --- a/internal/system/tmpfiles.go +++ b/internal/system/tmpfiles.go @@ -9,7 +9,6 @@ import ( "git.ophivana.moe/security/fortify/acl" "git.ophivana.moe/security/fortify/internal/fmsg" - "git.ophivana.moe/security/fortify/internal/verbose" ) // CopyFile registers an Op that copies path dst from src. @@ -72,15 +71,15 @@ func (t *Tmpfile) Type() Enablement { func (t *Tmpfile) apply(_ *I) error { switch t.method { case tmpfileCopy: - verbose.Printf("publishing tmpfile %s\n", t) + fmsg.VPrintln("publishing tmpfile", t) return fmsg.WrapErrorSuffix(copyFile(t.dst, t.src), fmt.Sprintf("cannot copy tmpfile %q:", t.dst)) case tmpfileLink: - verbose.Printf("linking tmpfile %s\n", t) + fmsg.VPrintln("linking tmpfile", t) return fmsg.WrapErrorSuffix(os.Link(t.src, t.dst), fmt.Sprintf("cannot link tmpfile %q:", t.dst)) case tmpfileWrite: - verbose.Printf("writing %s\n", t) + fmsg.VPrintln("writing", t) return fmsg.WrapErrorSuffix(os.WriteFile(t.dst, []byte(t.src), 0600), fmt.Sprintf("cannot write tmpfile %q:", t.dst)) default: @@ -90,11 +89,11 @@ func (t *Tmpfile) apply(_ *I) error { func (t *Tmpfile) revert(_ *I, ec *Criteria) error { if ec.hasType(t) { - verbose.Printf("removing tmpfile %q\n", t.dst) + fmsg.VPrintf("removing tmpfile %q", t.dst) return fmsg.WrapErrorSuffix(os.Remove(t.dst), fmt.Sprintf("cannot remove tmpfile %q:", t.dst)) } else { - verbose.Printf("skipping tmpfile %q\n", t.dst) + fmsg.VPrintf("skipping tmpfile %q", t.dst) return nil } } |