Add runtime to service.Options()

This commit is contained in:
Ben Toogood 2020-05-11 17:09:28 +01:00
parent 688228377b
commit f892b41299
6 changed files with 42 additions and 20 deletions

View File

@ -3,7 +3,6 @@ package vpath
import ( import (
"errors" "errors"
"fmt"
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"
@ -28,8 +27,6 @@ func (r *Resolver) Resolve(req *http.Request) (*resolver.Endpoint, error) {
return nil, errors.New("unknown name") return nil, errors.New("unknown name")
} }
fmt.Println(req.URL.Path)
parts := strings.Split(req.URL.Path[1:], "/") parts := strings.Split(req.URL.Path[1:], "/")
if len(parts) == 1 { if len(parts) == 1 {
return &resolver.Endpoint{ return &resolver.Endpoint{

View File

@ -100,6 +100,12 @@ func Registry(r *registry.Registry) Option {
} }
} }
func Runtime(r *runtime.Runtime) Option {
return func(o *Options) {
o.Runtime = r
}
}
func Transport(t *transport.Transport) Option { func Transport(t *transport.Transport) Option {
return func(o *Options) { return func(o *Options) {
o.Transport = t o.Transport = t

View File

@ -14,6 +14,7 @@ import (
"github.com/micro/go-micro/v2/debug/profile" "github.com/micro/go-micro/v2/debug/profile"
"github.com/micro/go-micro/v2/debug/trace" "github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/v2/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/v2/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/v2/store" "github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/v2/transport" "github.com/micro/go-micro/v2/transport"
@ -29,6 +30,7 @@ type Options struct {
Server server.Server Server server.Server
Store store.Store Store store.Store
Registry registry.Registry Registry registry.Registry
Runtime runtime.Runtime
Transport transport.Transport Transport transport.Transport
Profile profile.Profile Profile profile.Profile
@ -55,6 +57,7 @@ func newOptions(opts ...Option) Options {
Server: server.DefaultServer, Server: server.DefaultServer,
Store: store.DefaultStore, Store: store.DefaultStore,
Registry: registry.DefaultRegistry, Registry: registry.DefaultRegistry,
Runtime: runtime.DefaultRuntime,
Transport: transport.DefaultTransport, Transport: transport.DefaultTransport,
Context: context.Background(), Context: context.Background(),
Signal: true, Signal: true,
@ -182,6 +185,13 @@ func Transport(t transport.Transport) Option {
} }
} }
// Runtime sets the runtime
func Runtime(r runtime.Runtime) Option {
return func(o *Options) {
o.Runtime = r
}
}
// Convenience options // Convenience options
// Address sets the address of the server // Address sets the address of the server

View File

@ -3,6 +3,8 @@ package runtime
import ( import (
"context" "context"
"io" "io"
"github.com/micro/go-micro/v2/client"
) )
type Option func(o *Options) type Option func(o *Options)
@ -17,6 +19,8 @@ type Options struct {
Source string Source string
// Base image to use // Base image to use
Image string Image string
// Client to use when making requests
Client client.Client
} }
// WithSource sets the base image / repository // WithSource sets the base image / repository
@ -47,6 +51,13 @@ func WithImage(t string) Option {
} }
} }
// WithClient sets the client to use
func WithClient(c client.Client) Option {
return func(o *Options) {
o.Client = c
}
}
type CreateOption func(o *CreateOptions) type CreateOption func(o *CreateOptions)
type ReadOption func(o *ReadOptions) type ReadOption func(o *ReadOptions)

View File

@ -24,6 +24,9 @@ func (s *svc) Init(opts ...runtime.Option) error {
o(&s.options) o(&s.options)
} }
// reset the runtime as the client could have changed
s.runtime = pb.NewRuntimeService(runtime.DefaultName, s.options.Client)
return nil return nil
} }
@ -278,19 +281,17 @@ func (s *svc) String() string {
// NewRuntime creates new service runtime and returns it // NewRuntime creates new service runtime and returns it
func NewRuntime(opts ...runtime.Option) runtime.Runtime { func NewRuntime(opts ...runtime.Option) runtime.Runtime {
// get default options var options runtime.Options
options := runtime.Options{}
// apply requested options
for _, o := range opts { for _, o := range opts {
o(&options) o(&options)
} }
if options.Client == nil {
// create default client options.Client = client.DefaultClient
cli := client.DefaultClient }
return &svc{ return &svc{
options: options, options: options,
runtime: pb.NewRuntimeService(runtime.DefaultName, cli), runtime: pb.NewRuntimeService(runtime.DefaultName, options.Client),
} }
} }

View File

@ -3,7 +3,7 @@ package micro
import ( import (
"os" "os"
"os/signal" "os/signal"
"runtime" rtime "runtime"
"strings" "strings"
"sync" "sync"
@ -15,6 +15,7 @@ import (
"github.com/micro/go-micro/v2/debug/trace" "github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/v2/logger" "github.com/micro/go-micro/v2/logger"
"github.com/micro/go-micro/v2/plugin" "github.com/micro/go-micro/v2/plugin"
"github.com/micro/go-micro/v2/runtime"
"github.com/micro/go-micro/v2/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/v2/store" "github.com/micro/go-micro/v2/store"
signalutil "github.com/micro/go-micro/v2/util/signal" signalutil "github.com/micro/go-micro/v2/util/signal"
@ -98,6 +99,7 @@ func (s *service) Init(opts ...Option) {
cmd.Auth(&s.opts.Auth), cmd.Auth(&s.opts.Auth),
cmd.Broker(&s.opts.Broker), cmd.Broker(&s.opts.Broker),
cmd.Registry(&s.opts.Registry), cmd.Registry(&s.opts.Registry),
cmd.Runtime(&s.opts.Runtime),
cmd.Transport(&s.opts.Transport), cmd.Transport(&s.opts.Transport),
cmd.Client(&s.opts.Client), cmd.Client(&s.opts.Client),
cmd.Config(&s.opts.Config), cmd.Config(&s.opts.Config),
@ -112,13 +114,8 @@ func (s *service) Init(opts ...Option) {
name := s.opts.Cmd.App().Name name := s.opts.Cmd.App().Name
s.opts.Store.Init(store.Table(name)) s.opts.Store.Init(store.Table(name))
// TODO: replace Cmd.Init with config.Load // Set the client for the micro clients
// Right now we're just going to load a token s.opts.Runtime.Init(runtime.WithClient(s.Client()))
// May need to re-read value on change
// TODO: should be scoped to micro/auth/token
// if tk, _ := config.Get("token"); len(tk) > 0 {
// s.opts.Auth.Init(auth.ServiceToken(tk))
// }
}) })
} }
@ -192,9 +189,9 @@ func (s *service) Run() error {
// start the profiler // start the profiler
if s.opts.Profile != nil { if s.opts.Profile != nil {
// to view mutex contention // to view mutex contention
runtime.SetMutexProfileFraction(5) rtime.SetMutexProfileFraction(5)
// to view blocking profile // to view blocking profile
runtime.SetBlockProfileRate(1) rtime.SetBlockProfileRate(1)
if err := s.opts.Profile.Start(); err != nil { if err := s.opts.Profile.Start(); err != nil {
return err return err