Skip to content

Bugfix/dbus methods context #430

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bugfix/dbus methods context #430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085c827
dbus/methods: observe context for Cancellation to remove job listener
j-licht Oct 13, 2023
838f5a9
dbus/methods: don't write blocking to jobListener channel
j-licht Oct 13, 2023
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
20 changes: 19 additions & 1 deletion dbus/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ func (c *Conn) jobComplete(signal *dbus.Signal) {
c.jobListener.Lock()
out, ok := c.jobListener.jobs[job]
if ok {
out <- result
select {
case out <- result:
default:
}
delete(c.jobListener.jobs, job)
}
c.jobListener.Unlock()
Expand All @@ -67,12 +70,27 @@ func (c *Conn) startJob(ctx context.Context, ch chan<- string, job string, args
c.jobListener.jobs[p] = ch
}

go c.observeContextCancellation(ctx, p)

// ignore error since 0 is fine if conversion fails
jobID, _ := strconv.Atoi(path.Base(string(p)))

return jobID, nil
}

func (c *Conn) observeContextCancellation(ctx context.Context, jobId dbus.ObjectPath) {
<-ctx.Done()

// remove job listener if one exists
c.jobListener.Lock()
defer c.jobListener.Unlock()

_, ok := c.jobListener.jobs[jobId]
if ok {
delete(c.jobListener.jobs, jobId)
}
}

// Deprecated: use StartUnitContext instead.
func (c *Conn) StartUnit(name string, mode string, ch chan<- string) (int, error) {
return c.StartUnitContext(context.Background(), name, mode, ch)
Expand Down