From 42e0b168e3d75389dfb968aebf9f5629d64782f9 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Mon, 21 Oct 2024 20:47:02 +0900 Subject: 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 --- internal/system/xhost.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/system/xhost.go') diff --git a/internal/system/xhost.go b/internal/system/xhost.go index 4ed3f8bd..51c8d24f 100644 --- a/internal/system/xhost.go +++ b/internal/system/xhost.go @@ -4,7 +4,6 @@ import ( "fmt" "git.ophivana.moe/security/fortify/internal/fmsg" - "git.ophivana.moe/security/fortify/internal/verbose" "git.ophivana.moe/security/fortify/xcb" ) @@ -23,18 +22,18 @@ func (x XHost) Type() Enablement { } func (x XHost) apply(_ *I) error { - verbose.Printf("inserting entry %s to X11\n", x) + fmsg.VPrintf("inserting entry %s to X11", x) return fmsg.WrapErrorSuffix(xcb.ChangeHosts(xcb.HostModeInsert, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), fmt.Sprintf("cannot insert entry %s to X11:", x)) } func (x XHost) revert(_ *I, ec *Criteria) error { if ec.hasType(x) { - verbose.Printf("deleting entry %s from X11\n", x) + fmsg.VPrintf("deleting entry %s from X11", x) return fmsg.WrapErrorSuffix(xcb.ChangeHosts(xcb.HostModeDelete, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), fmt.Sprintf("cannot delete entry %s from X11:", x)) } else { - verbose.Printf("skipping entry %s in X11\n", x) + fmsg.VPrintf("skipping entry %s in X11", x) return nil } } -- cgit v1.3.1