Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
1656a823
Commit
1656a823
authored
2 years ago
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
revert some stuff
parent
8f69fe6e
No related branches found
No related tags found
3 merge requests
!510
Release
,
!365
attempt to fix mutex segfault in HandleReceivedRequest
,
!354
Channels impl
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
auth/store/store.go
+11
-1
11 additions, 1 deletion
auth/store/store.go
go.mod
+1
-1
1 addition, 1 deletion
go.mod
with
12 additions
and
2 deletions
auth/store/store.go
+
11
−
1
View file @
1656a823
...
@@ -242,8 +242,9 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
...
@@ -242,8 +242,9 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
s
.
mux
.
RLock
()
s
.
mux
.
RLock
()
rr
,
ok
:=
s
.
receivedByID
[
*
partner
]
rr
,
ok
:=
s
.
receivedByID
[
*
partner
]
s
.
mux
.
RUnlock
()
if
!
ok
{
if
!
ok
{
s
.
mux
.
RUnlock
()
return
errors
.
Errorf
(
"Received request not "
+
return
errors
.
Errorf
(
"Received request not "
+
"found: %s"
,
partner
)
"found: %s"
,
partner
)
}
}
...
@@ -252,8 +253,17 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
...
@@ -252,8 +253,17 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
rr
.
mux
.
Lock
()
rr
.
mux
.
Lock
()
defer
rr
.
mux
.
Unlock
()
defer
rr
.
mux
.
Unlock
()
// Check that the request still exists; it could have been deleted while the
// lock was taken
s
.
mux
.
RLock
()
_
,
ok
=
s
.
receivedByID
[
*
partner
]
s
.
mux
.
RUnlock
()
s
.
mux
.
RUnlock
()
if
!
ok
{
return
errors
.
Errorf
(
"Received request not "
+
"found: %s"
,
partner
)
}
//run the handler
//run the handler
handleErr
:=
handler
(
rr
)
handleErr
:=
handler
(
rr
)
if
handleErr
!=
nil
{
if
handleErr
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
go.mod
+
1
−
1
View file @
1656a823
...
@@ -6,7 +6,6 @@ require (
...
@@ -6,7 +6,6 @@ require (
github.com/cloudflare/circl
v1.2.0
github.com/cloudflare/circl
v1.2.0
github.com/golang-collections/collections
v0.0.0-20130729185459-604e922904d3
github.com/golang-collections/collections
v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf
v1.5.2
github.com/golang/protobuf
v1.5.2
github.com/hack-pad/go-indexeddb
v0.2.0
github.com/nfnt/resize
v0.0.0-20180221191011-83c6a9932646
github.com/nfnt/resize
v0.0.0-20180221191011-83c6a9932646
github.com/pkg/errors
v0.9.1
github.com/pkg/errors
v0.9.1
github.com/pkg/profile
v1.6.0
github.com/pkg/profile
v1.6.0
...
@@ -33,6 +32,7 @@ require (
...
@@ -33,6 +32,7 @@ require (
github.com/badoux/checkmail
v1.2.1 // indirect
github.com/badoux/checkmail
v1.2.1 // indirect
github.com/elliotchance/orderedmap
v1.4.0 // indirect
github.com/elliotchance/orderedmap
v1.4.0 // indirect
github.com/fsnotify/fsnotify
v1.5.4 // indirect
github.com/fsnotify/fsnotify
v1.5.4 // indirect
github.com/hack-pad/go-indexeddb
v0.2.0 // indirect
github.com/hashicorp/hcl
v1.0.0 // indirect
github.com/hashicorp/hcl
v1.0.0 // indirect
github.com/inconshreveable/mousetrap
v1.0.0 // indirect
github.com/inconshreveable/mousetrap
v1.0.0 // indirect
github.com/klauspost/cpuid/v2
v2.1.0 // indirect
github.com/klauspost/cpuid/v2
v2.1.0 // indirect
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment