Skip to content

Fix STOP command not stopping discovery syncing #25

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
merged 1 commit into from
Aug 12, 2021
Merged

Fix STOP command not stopping discovery syncing #25

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
6 changes: 3 additions & 3 deletions sync/sync_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ func Start(eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) (ch
// Output initial port state: get the current port list to send as initial "add" events
current, err := enumerator.GetDetailedPortsList()
if err != nil {
// TODO: how to handle errors? should we just retry silently?
errorCB(err.Error())
return
}
for _, port := range current {
eventCB("add", toDiscoveryPort(port))
Expand All @@ -71,7 +72,7 @@ func Start(eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) (ch
events := make([]syscall.Kevent_t, 10)

for {
t100ms := syscall.Timespec{Nsec: 100000000, Sec: 0}
t100ms := syscall.Timespec{Nsec: 100_000_000, Sec: 0}
n, err := syscall.Kevent(kq, []syscall.Kevent_t{ev1}, events, &t100ms)
select {
case <-closeChan:
Expand All @@ -92,7 +93,6 @@ func Start(eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) (ch
// if there is an event retry up to 5 times
var enumeratorErr error
for retries := 0; retries < 5; retries++ {
retries--
updates, err := enumerator.GetDetailedPortsList()
if err != nil {
enumeratorErr = err
Expand Down