Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
22a7f0099
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2022
22a7f0099
Commits
0dea341e
Commit
0dea341e
authored
4 years ago
by
邹毅贤
Browse files
Options
Downloads
Patches
Plain Diff
fix review comments
parent
bcac1db1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
registry/base_registry.go
+27
-10
27 additions, 10 deletions
registry/base_registry.go
registry/mock_registry.go
+0
-1
0 additions, 1 deletion
registry/mock_registry.go
with
27 additions
and
11 deletions
registry/base_registry.go
+
27
−
10
View file @
0dea341e
...
...
@@ -380,9 +380,32 @@ func (r *BaseRegistry) Subscribe(url *common.URL, notifyListener NotifyListener)
n
:=
0
for
{
n
++
err
:=
r
.
processNotify
(
url
,
notifyListener
,
r
.
facadeBasedRegistry
.
DoSubscribe
)
if
err
==
nil
{
return
nil
if
!
r
.
IsAvailable
()
{
logger
.
Warnf
(
"event listener game over."
)
return
perrors
.
New
(
"nacosRegistry is not available."
)
}
listener
,
err
:=
r
.
facadeBasedRegistry
.
DoSubscribe
(
url
)
if
err
!=
nil
{
if
!
r
.
IsAvailable
()
{
logger
.
Warnf
(
"event listener game over."
)
return
err
}
logger
.
Warnf
(
"getListener() = err:%v"
,
perrors
.
WithStack
(
err
))
time
.
Sleep
(
time
.
Duration
(
RegistryConnDelay
)
*
time
.
Second
)
continue
}
for
{
if
serviceEvent
,
err
:=
listener
.
Next
();
err
!=
nil
{
logger
.
Warnf
(
"Selector.watch() = error{%v}"
,
perrors
.
WithStack
(
err
))
listener
.
Close
()
break
}
else
{
logger
.
Infof
(
"update begin, service event: %v"
,
serviceEvent
.
String
())
notifyListener
.
Notify
(
serviceEvent
)
}
}
sleepWait
(
n
)
}
...
...
@@ -390,18 +413,12 @@ func (r *BaseRegistry) Subscribe(url *common.URL, notifyListener NotifyListener)
// UnSubscribe :UnSubscribeURL
func
(
r
*
BaseRegistry
)
UnSubscribe
(
url
*
common
.
URL
,
notifyListener
NotifyListener
)
error
{
return
r
.
processNotify
(
url
,
notifyListener
,
r
.
facadeBasedRegistry
.
DoUnsubscribe
)
}
// processNotify can process notify listener when Subscribe or UnSubscribe
func
(
r
*
BaseRegistry
)
processNotify
(
url
*
common
.
URL
,
notifyListener
NotifyListener
,
f
func
(
conf
*
common
.
URL
)
(
Listener
,
error
))
error
{
if
!
r
.
IsAvailable
()
{
logger
.
Warnf
(
"event listener game over."
)
return
nil
}
listener
,
err
:=
f
(
url
)
listener
,
err
:=
r
.
facadeBasedRegistry
.
DoUnsubscribe
(
url
)
if
err
!=
nil
{
if
!
r
.
IsAvailable
()
{
logger
.
Warnf
(
"event listener game over."
)
...
...
This diff is collapsed.
Click to expand it.
registry/mock_registry.go
+
0
−
1
View file @
0dea341e
...
...
@@ -53,7 +53,6 @@ func (*MockRegistry) Register(url common.URL) error {
// UnRegister
func
(
r
*
MockRegistry
)
UnRegister
(
conf
common
.
URL
)
error
{
return
nil
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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