unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 282 Wiki Activity

Merge branch 'master' into runtime-multitenancy

Browse Source
This commit is contained in:
ben-toogood 2020-05-19 13:24:35 +01:00 committed by GitHub
commit cf37d64819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/service.go
View File

@ -112,8 +112,8 @@ func (s *service) run(exit chan bool) {
}
func (s *service) register() error {
s.RLock()
defer s.RUnlock()
s.Lock()
defer s.Unlock()
if s.srv == nil {
return nil
@ -142,8 +142,8 @@ func (s *service) register() error {
}
func (s *service) deregister() error {
s.RLock()
defer s.RUnlock()
s.Lock()
defer s.Unlock()
if s.srv == nil {
return nil
@ -406,7 +406,9 @@ func (s *service) Init(opts ...Option) error {
s.RLock()
// pass in own name and version
serviceOpts = append(serviceOpts, micro.Name(s.opts.Name))
if s.opts.Service.Name() == "" {
serviceOpts = append(serviceOpts, micro.Name(s.opts.Name))
}
serviceOpts = append(serviceOpts, micro.Version(s.opts.Version))
s.RUnlock()