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

Merge pull request #778 from micro/register-interval

Browse Source 
Set register ttl and interval by default
This commit is contained in:
Asim Aslam 2019-09-23 18:04:52 +01:00 committed by GitHub
commit 71ab35e055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/cmd/cmd.go
View File

@ -95,11 +95,13 @@ var (
cli.IntFlag{ cli.IntFlag{
Name: "register_ttl", Name: "register_ttl",
EnvVar: "MICRO_REGISTER_TTL", EnvVar: "MICRO_REGISTER_TTL",
Value: 60,
Usage: "Register TTL in seconds", Usage: "Register TTL in seconds",
}, },
cli.IntFlag{ cli.IntFlag{
Name: "register_interval", Name: "register_interval",
EnvVar: "MICRO_REGISTER_INTERVAL", EnvVar: "MICRO_REGISTER_INTERVAL",
Value: 30,
Usage: "Register interval in seconds", Usage: "Register interval in seconds",
}, },
cli.StringFlag{ cli.StringFlag{
@ -417,11 +419,11 @@ func (c *cmd) Before(ctx *cli.Context) error {
serverOpts = append(serverOpts, server.Advertise(ctx.String("server_advertise"))) serverOpts = append(serverOpts, server.Advertise(ctx.String("server_advertise")))
} }
if ttl := time.Duration(ctx.GlobalInt("register_ttl")); ttl > 0 { if ttl := time.Duration(ctx.GlobalInt("register_ttl")); ttl >= 0 {
serverOpts = append(serverOpts, server.RegisterTTL(ttl*time.Second)) serverOpts = append(serverOpts, server.RegisterTTL(ttl*time.Second))
} }
if val := time.Duration(ctx.GlobalInt("register_interval")); val > 0 { if val := time.Duration(ctx.GlobalInt("register_interval")); val >= 0 {
serverOpts = append(serverOpts, server.RegisterInterval(val*time.Second)) serverOpts = append(serverOpts, server.RegisterInterval(val*time.Second))
} }

6
server/options.go
View File

@ -42,8 +42,10 @@ type Options struct {
func newOptions(opt ...Option) Options { func newOptions(opt ...Option) Options {
opts := Options{ opts := Options{
Codecs: make(map[string]codec.NewCodec), Codecs: make(map[string]codec.NewCodec),
Metadata: map[string]string{}, Metadata: map[string]string{},
RegisterInterval: DefaultRegisterInterval,
RegisterTTL: DefaultRegisterTTL,
} }
for _, o := range opt { for _, o := range opt {

16
server/server.go
View File

@ -116,13 +116,15 @@ type Subscriber interface {
type Option func(*Options) type Option func(*Options)
var ( var (
DefaultAddress = ":0" DefaultAddress = ":0"
DefaultName = "go.micro.server" DefaultName = "go.micro.server"
DefaultVersion = time.Now().Format("2006.01.02.15.04") DefaultVersion = time.Now().Format("2006.01.02.15.04")
DefaultId = uuid.New().String() DefaultId = uuid.New().String()
DefaultServer Server = newRpcServer() DefaultServer Server = newRpcServer()
DefaultRouter = newRpcRouter() DefaultRouter = newRpcRouter()
DefaultRegisterCheck = func(context.Context) error { return nil } DefaultRegisterCheck = func(context.Context) error { return nil }
DefaultRegisterInterval = time.Second * 30
DefaultRegisterTTL = time.Minute
) )
// DefaultOptions returns config options for the default service // DefaultOptions returns config options for the default service