Skip to content

Shutdown file watcher when stopping identity watcher. Fixes #68 #69

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
plorenz merged 1 commit into from
Sep 19, 2025
Merged

Shutdown file watcher when stopping identity watcher. Fixes #68 #69

Show file tree
Hide file tree
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
11 changes: 6 additions & 5 deletions identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,19 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/foundation/v2/tlz"
"github.com/openziti/identity/certtools"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"os"
"path/filepath"
"sort"
"strings"
"sync"
"sync/atomic"
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/foundation/v2/tlz"
"github.com/openziti/identity/certtools"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)

const (
Expand Down
12 changes: 8 additions & 4 deletions identity_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ func (id *ID) startWatching() error {
}

go func() {
defer func() {
if closeErr := watcher.Close(); closeErr != nil {
logrus.WithError(closeErr).Error("error closing identity file watcher")
}
}()

for {
select {
case event, ok := <-watcher.Events:
Expand Down Expand Up @@ -82,11 +88,9 @@ func (id *ID) startWatching() error {
}()

for _, file := range files {
err := watcher.Add(file)

if err != nil {
if err = watcher.Add(file); err != nil {
_ = watcher.Close()
close(id.closeNotify)
return err
}
}

Expand Down
Loading