Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
miniresolver
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ub-unibas
cloudservices
miniresolver
Commits
d8f9d6da
Commit
d8f9d6da
authored
9 months ago
by
Juergen Enge
Browse files
Options
Downloads
Patches
Plain Diff
single instance parameter for server initialization
parent
1c724728
No related branches found
Branches containing commit
Tags
v2.0.17
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/resolver/resolver.go
+2
-2
2 additions, 2 deletions
pkg/resolver/resolver.go
pkg/resolver/server.go
+4
-1
4 additions, 1 deletion
pkg/resolver/server.go
with
6 additions
and
3 deletions
pkg/resolver/resolver.go
+
2
−
2
View file @
d8f9d6da
...
...
@@ -172,11 +172,11 @@ func (c *MiniResolver) Close() error {
return
errors
.
Combine
(
errs
...
)
}
func
(
c
*
MiniResolver
)
NewServer
(
addr
string
,
domains
[]
string
)
(
*
Server
,
error
)
{
func
(
c
*
MiniResolver
)
NewServer
(
addr
string
,
domains
[]
string
,
single
bool
)
(
*
Server
,
error
)
{
if
c
.
MiniResolverClient
==
nil
{
return
nil
,
errors
.
Errorf
(
"no miniresolver client"
)
}
server
,
err
:=
newServer
(
addr
,
domains
,
c
.
serverTLSConfig
,
c
.
MiniResolverClient
,
c
.
logger
,
c
.
serverOpts
...
)
server
,
err
:=
newServer
(
addr
,
domains
,
c
.
serverTLSConfig
,
c
.
MiniResolverClient
,
single
,
c
.
logger
,
c
.
serverOpts
...
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"cannot create server for %s"
,
addr
)
}
...
...
This diff is collapsed.
Click to expand it.
pkg/resolver/server.go
+
4
−
1
View file @
d8f9d6da
...
...
@@ -15,7 +15,7 @@ import (
"time"
)
func
newServer
(
addr
string
,
domains
[]
string
,
tlsConfig
*
tls
.
Config
,
resolver
pb
.
MiniResolverClient
,
logger
zLogger
.
ZLogger
,
opts
...
grpc
.
ServerOption
)
(
*
Server
,
error
)
{
func
newServer
(
addr
string
,
domains
[]
string
,
tlsConfig
*
tls
.
Config
,
resolver
pb
.
MiniResolverClient
,
single
bool
,
logger
zLogger
.
ZLogger
,
opts
...
grpc
.
ServerOption
)
(
*
Server
,
error
)
{
if
tlsConfig
==
nil
{
return
nil
,
errors
.
New
(
"no tls configuration"
)
}
...
...
@@ -44,6 +44,7 @@ func newServer(addr string, domains []string, tlsConfig *tls.Config, resolver pb
resolver
:
resolver
,
waitShutdown
:
sync
.
WaitGroup
{},
domains
:
domains
,
single
:
single
,
}
return
server
,
nil
}
...
...
@@ -57,6 +58,7 @@ type Server struct {
resolver
pb
.
MiniResolverClient
addr
string
domains
[]
string
single
bool
}
func
(
s
*
Server
)
GetAddr
()
string
{
...
...
@@ -97,6 +99,7 @@ func (s *Server) Startup() {
Service
:
name
,
Port
:
uint32
(
portInt
),
Domains
:
s
.
domains
,
Single
:
s
.
single
,
});
err
!=
nil
{
s
.
logger
.
Error
()
.
Err
(
err
)
.
Msg
(
"cannot register service"
)
}
else
{
...
...
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