diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-02-07 13:16:54 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-02-07 13:16:54 +0900 |
| commit | 2e521914042ec427cae3c429b448c4bc3eed61de (patch) | |
| tree | 87707e201da62d9133e4b194adedeba8432cff45 /internal | |
| parent | 568d7758d5308457967672997d9d2e786c7403f1 (diff) | |
system/dbus: dump method prints msgbuf
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/app/seal.go | 4 | ||||
| -rw-r--r-- | internal/app/start.go | 6 | ||||
| -rw-r--r-- | internal/system/dbus.go | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/internal/app/seal.go b/internal/app/seal.go index 228be5c9..155fafb3 100644 --- a/internal/app/seal.go +++ b/internal/app/seal.go @@ -34,8 +34,8 @@ var posixUsername = regexp.MustCompilePOSIX("^[a-z_]([A-Za-z0-9_-]{0,31}|[A-Za-z type appSeal struct { // app unique ID string representation id string - // dbus proxy message buffer retriever - dbusMsg func(f func(msgbuf []string)) + // dump dbus proxy message buffer + dbusMsg func() // freedesktop application ID fid string diff --git a/internal/app/start.go b/internal/app/start.go index d0a0116d..96198df5 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -140,11 +140,7 @@ func (a *app) Run(ctx context.Context, rs *RunState) error { // print queued up dbus messages if a.seal.dbusMsg != nil { - a.seal.dbusMsg(func(msgbuf []string) { - for _, msg := range msgbuf { - fmsg.Println(msg) - } - }) + a.seal.dbusMsg() } // update store and revert app setup transaction diff --git a/internal/system/dbus.go b/internal/system/dbus.go index 886ba77f..859fa029 100644 --- a/internal/system/dbus.go +++ b/internal/system/dbus.go @@ -23,7 +23,7 @@ func (sys *I) MustProxyDBus(sessionPath string, session *dbus.Config, systemPath } } -func (sys *I) ProxyDBus(session, system *dbus.Config, sessionPath, systemPath string) (func(f func(msgbuf []string)), error) { +func (sys *I) ProxyDBus(session, system *dbus.Config, sessionPath, systemPath string) (func(), error) { d := new(DBus) // used by waiting goroutine to notify process exit @@ -65,7 +65,7 @@ func (sys *I) ProxyDBus(session, system *dbus.Config, sessionPath, systemPath st // seal dbus proxy d.out = &scanToFmsg{msg: new(strings.Builder)} - return d.out.F, fmsg.WrapErrorSuffix(d.proxy.Seal(session, system), + return d.out.Dump, fmsg.WrapErrorSuffix(d.proxy.Seal(session, system), "cannot seal message bus proxy:") } @@ -195,8 +195,10 @@ func (s *scanToFmsg) write(p []byte, a int) (int, error) { } } -func (s *scanToFmsg) F(f func(msgbuf []string)) { +func (s *scanToFmsg) Dump() { s.mu.RLock() - f(s.msgbuf) + for _, msg := range s.msgbuf { + fmsg.Println(msg) + } s.mu.RUnlock() } |