unistack-org/micro
4
0
Fork 2
Code Issues 21 Pull Requests Actions Packages Projects Releases 322 Wiki Activity

many improvements with options and noop stuff

Browse Source 
* add many options helpers
* fix noop client to allow publish messages to topic in broker
* fix noop server to allow registering in registry
* fix noop server to allow subscribe to topic in broker
* fix new service initialization

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-10-16 09:38:57 +03:00
parent a59aae760f
commit 14c97d59c1
39 changed files with 1384 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
service.go
View File

@@ -5,9 +5,13 @@ import (
"sync"
cmd "github.com/unistack-org/micro-config-cmd"
"github.com/unistack-org/micro/v3/broker"
"github.com/unistack-org/micro/v3/client"
"github.com/unistack-org/micro/v3/logger"
"github.com/unistack-org/micro/v3/network/transport"
"github.com/unistack-org/micro/v3/registry"
"github.com/unistack-org/micro/v3/server"
"github.com/unistack-org/micro/v3/store"
)
type service struct {
@@ -31,84 +35,94 @@ func (s *service) Name() string {
// Init initialises options. Additionally it calls cmd.Init
// which parses command line flags. cmd.Init is only called
// on first Init.
func (s *service) Init(opts ...Option) {
func (s *service) Init(opts ...Option) error {
// process options
for _, o := range opts {
o(&s.opts)
}
s.once.Do(func() {
if s.opts.Cmd != nil {
// set cmd name
if len(s.opts.Cmd.App().Name) == 0 {
s.opts.Cmd.App().Name = s.Server().Options().Name
}
// Initialise the command options
if err := s.opts.Cmd.Init(
cmd.Auth(&s.opts.Auth),
cmd.Broker(&s.opts.Broker),
cmd.Registry(&s.opts.Registry),
cmd.Runtime(&s.opts.Runtime),
cmd.Transport(&s.opts.Transport),
cmd.Client(&s.opts.Client),
cmd.Config(&s.opts.Config),
cmd.Server(&s.opts.Server),
cmd.Store(&s.opts.Store),
cmd.Profile(&s.opts.Profile),
); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
}
if s.opts.Cmd != nil {
// set cmd name
if len(s.opts.Cmd.App().Name) == 0 {
s.opts.Cmd.App().Name = s.Server().Options().Name
}
})
// Initialise the command options
if err := s.opts.Cmd.Init(
cmd.Auth(&s.opts.Auth),
cmd.Broker(&s.opts.Broker),
cmd.Registry(&s.opts.Registry),
cmd.Runtime(&s.opts.Runtime),
cmd.Transport(&s.opts.Transport),
cmd.Client(&s.opts.Client),
cmd.Config(&s.opts.Config),
cmd.Server(&s.opts.Server),
cmd.Store(&s.opts.Store),
cmd.Profile(&s.opts.Profile),
); err != nil {
return err
}
}
if s.opts.Registry != nil {
if err := s.opts.Registry.Init(); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Registry.Init(
registry.Context(s.opts.Context),
); err != nil {
return err
}
}
if s.opts.Broker != nil {
if err := s.opts.Broker.Init(); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Broker.Init(
broker.Context(s.opts.Context),
); err != nil {
return err
}
}
if s.opts.Transport != nil {
if err := s.opts.Transport.Init(); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Transport.Init(
transport.Context(s.opts.Context),
); err != nil {
return err
}
}
if s.opts.Store != nil {
if err := s.opts.Store.Init(s.opts.Context); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Store.Init(
store.Context(s.opts.Context),
); err != nil {
return err
}
}
if s.opts.Server != nil {
if err := s.opts.Server.Init(); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Server.Init(
server.Context(s.opts.Context),
); err != nil {
return err
}
}
if s.opts.Client != nil {
if err := s.opts.Client.Init(); err != nil {
logger.Fatalf("[cmd] init failed: %v", err)
if err := s.opts.Client.Init(
client.Context(s.opts.Context),
); err != nil {
return err
}
}
// execute the command
// TODO: do this in service.Run()
if err := s.opts.Cmd.Run(); err != nil {
logger.Fatalf("[cmd] run failed: %v", err)
}
return nil
}
func (s *service) Options() Options {
return s.opts
}
func (s *service) Broker() broker.Broker {
return s.opts.Broker
}
func (s *service) Client() client.Client {
return s.opts.Client
}
@@ -185,6 +199,12 @@ func (s *service) Run() error {
defer s.opts.Profile.Stop()
}
if s.opts.Cmd != nil {
if err := s.opts.Cmd.Run(); err != nil {
return err
}
}
if err := s.Start(); err != nil {
return err
}