Skip to content

svc/windows: support closing via context.Done() #15

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

Merged
judwhite merged 1 commit into from
Feb 1, 2021
Merged

svc/windows: support closing via context.Done() #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 29 additions & 2 deletions svc/svc_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,16 @@ func (ws *windowsService) run() error {

signalChan := make(chan os.Signal, 1)
signalNotify(signalChan, ws.signals...)
<-signalChan

var doneChan <-chan struct{}
if s, ok := ws.i.(Context); ok {
doneChan = ws.i.Context().Done()
}

select {
case <-signalChan:
case <-doneChan:
}

err = ws.i.Stop()

Expand All @@ -133,8 +142,26 @@ func (ws *windowsService) Execute(args []string, r <-chan wsvc.ChangeRequest, ch

changes <- wsvc.Status{State: wsvc.Running, Accepts: cmdsAccepted}
loop:

var doneChan <-chan struct{}
if s, ok := ws.i.(Context); ok {
doneChan = ws.i.Context().Done()
}

for {
c := <-r
var c wsvc.ChangeRequest
select {
case c <- r:
case <-doneChan:
changes <- wsvc.Status{State: wsvc.StopPending}
err := ws.i.Stop()
if err != nil {
ws.setError(err)
return true, 2
}
break loop
}

switch c.Cmd {
case wsvc.Interrogate:
changes <- c.CurrentStatus
Expand Down