Skip to content

Fix data race in NewId() by using atomics #829

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 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Fix data race in NewId() by using atomics #829

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
7 changes: 4 additions & 3 deletions ziti/contexts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"net/http"
"net/url"
"strconv"
"sync/atomic"

"github.com/kataras/go-events"
"github.com/michaelquigley/pfxlog"
Expand All @@ -40,13 +41,13 @@ import (
"github.com/pkg/errors"
)

var idCount = 0
var idCount atomic.Int32

// NewId will return a unique string id suitable for ziti.Context Id functionality.
func NewId() string {
idCount = idCount + 1
new := idCount.Add(1)

return strconv.Itoa(idCount)
return strconv.Itoa(int(new))
}

// NewContextFromFile attempts to load a new Config from the provided path and then uses that
Expand Down