Update options to be public. This means people can implement the interfaces and actually use the options

server/options.go

@@ -7,166 +7,147 @@ import (
 	"github.com/micro/go-micro/transport"
 )
 
-type options struct {
-	codecs       map[string]codec.NewCodec
-	broker       broker.Broker
-	registry     registry.Registry
-	transport    transport.Transport
-	metadata     map[string]string
-	name         string
-	address      string
-	advertise    string
-	id           string
-	version      string
-	hdlrWrappers []HandlerWrapper
-	subWrappers  []SubscriberWrapper
+type Options struct {
+	Codecs       map[string]codec.NewCodec
+	Broker       broker.Broker
+	Registry     registry.Registry
+	Transport    transport.Transport
+	Metadata     map[string]string
+	Name         string
+	Address      string
+	Advertise    string
+	Id           string
+	Version      string
+	HdlrWrappers []HandlerWrapper
+	SubWrappers  []SubscriberWrapper
+
+	// Extra options settable by users.
+	// Used for other implementations.
+	Options map[string]string
 }
 
-func newOptions(opt ...Option) options {
-	opts := options{
-		codecs:   make(map[string]codec.NewCodec),
-		metadata: map[string]string{},
+func newOptions(opt ...Option) Options {
+	opts := Options{
+		Codecs:   make(map[string]codec.NewCodec),
+		Metadata: map[string]string{},
+		Options:  map[string]string{},
 	}
 
 	for _, o := range opt {
 		o(&opts)
 	}
 
-	if opts.broker == nil {
-		opts.broker = broker.DefaultBroker
+	if opts.Broker == nil {
+		opts.Broker = broker.DefaultBroker
 	}
 
-	if opts.registry == nil {
-		opts.registry = registry.DefaultRegistry
+	if opts.Registry == nil {
+		opts.Registry = registry.DefaultRegistry
 	}
 
-	if opts.transport == nil {
-		opts.transport = transport.DefaultTransport
+	if opts.Transport == nil {
+		opts.Transport = transport.DefaultTransport
 	}
 
-	if len(opts.address) == 0 {
-		opts.address = DefaultAddress
+	if len(opts.Address) == 0 {
+		opts.Address = DefaultAddress
 	}
 
-	if len(opts.name) == 0 {
-		opts.name = DefaultName
+	if len(opts.Name) == 0 {
+		opts.Name = DefaultName
 	}
 
-	if len(opts.id) == 0 {
-		opts.id = DefaultId
+	if len(opts.Id) == 0 {
+		opts.Id = DefaultId
 	}
 
-	if len(opts.version) == 0 {
-		opts.version = DefaultVersion
+	if len(opts.Version) == 0 {
+		opts.Version = DefaultVersion
 	}
 
 	return opts
 }
 
-func (o options) Name() string {
-	return o.name
-}
-
-func (o options) Id() string {
-	return o.name + "-" + o.id
-}
-
-func (o options) Version() string {
-	return o.version
-}
-
-func (o options) Address() string {
-	return o.address
-}
-
-func (o options) Advertise() string {
-	return o.advertise
-}
-
-func (o options) Metadata() map[string]string {
-	return o.metadata
-}
-
 // Server name
 func Name(n string) Option {
-	return func(o *options) {
-		o.name = n
+	return func(o *Options) {
+		o.Name = n
 	}
 }
 
 // Unique server id
 func Id(id string) Option {
-	return func(o *options) {
-		o.id = id
+	return func(o *Options) {
+		o.Id = id
 	}
 }
 
 // Version of the service
 func Version(v string) Option {
-	return func(o *options) {
-		o.version = v
+	return func(o *Options) {
+		o.Version = v
 	}
 }
 
 // Address to bind to - host:port
 func Address(a string) Option {
-	return func(o *options) {
-		o.address = a
+	return func(o *Options) {
+		o.Address = a
 	}
 }
 
 // The address to advertise for discovery - host:port
 func Advertise(a string) Option {
-	return func(o *options) {
-		o.advertise = a
+	return func(o *Options) {
+		o.Advertise = a
 	}
 }
 
 // Broker to use for pub/sub
 func Broker(b broker.Broker) Option {
-	return func(o *options) {
-		o.broker = b
+	return func(o *Options) {
+		o.Broker = b
 	}
 }
 
 // Codec to use to encode/decode requests for a given content type
 func Codec(contentType string, c codec.NewCodec) Option {
-	return func(o *options) {
-		o.codecs[contentType] = c
+	return func(o *Options) {
+		o.Codecs[contentType] = c
 	}
 }
 
 // Registry used for discovery
 func Registry(r registry.Registry) Option {
-	return func(o *options) {
-		o.registry = r
+	return func(o *Options) {
+		o.Registry = r
 	}
 }
 
 // Transport mechanism for communication e.g http, rabbitmq, etc
 func Transport(t transport.Transport) Option {
-	return func(o *options) {
-		o.transport = t
+	return func(o *Options) {
+		o.Transport = t
 	}
 }
 
 // Metadata associated with the server
 func Metadata(md map[string]string) Option {
-	return func(o *options) {
-		o.metadata = md
+	return func(o *Options) {
+		o.Metadata = md
 	}
 }
 
 // Adds a handler Wrapper to a list of options passed into the server
 func WrapHandler(w HandlerWrapper) Option {
-	return func(o *options) {
-		o.hdlrWrappers = append(o.hdlrWrappers, w)
+	return func(o *Options) {
+		o.HdlrWrappers = append(o.HdlrWrappers, w)
 	}
 }
 
 // Adds a subscriber Wrapper to a list of options passed into the server
 func WrapSubscriber(w SubscriberWrapper) Option {
-	return func(o *options) {
-		o.subWrappers = append(o.subWrappers, w)
+	return func(o *Options) {
+		o.SubWrappers = append(o.SubWrappers, w)
 	}
 }

server/rpc_server.go

@@ -23,7 +23,7 @@ type rpcServer struct {
 	exit chan chan error
 
 	sync.RWMutex
-	opts        options
+	opts        Options
 	handlers    map[string]Handler
 	subscribers map[*subscriber][]broker.Subscriber
 }
@@ -33,9 +33,9 @@ func newRpcServer(opts ...Option) Server {
 	return &rpcServer{
 		opts: options,
 		rpc: &server{
-			name:         options.name,
+			name:         options.Name,
 			serviceMap:   make(map[string]*service),
-			hdlrWrappers: options.hdlrWrappers,
+			hdlrWrappers: options.HdlrWrappers,
 		},
 		handlers:    make(map[string]Handler),
 		subscribers: make(map[*subscriber][]broker.Subscriber),
@@ -89,7 +89,7 @@ func (s *rpcServer) accept(sock transport.Socket) {
 }
 
 func (s *rpcServer) newCodec(contentType string) (codec.NewCodec, error) {
-	if cf, ok := s.opts.codecs[contentType]; ok {
+	if cf, ok := s.opts.Codecs[contentType]; ok {
 		return cf, nil
 	}
 	if cf, ok := defaultCodecs[contentType]; ok {
@@ -98,7 +98,7 @@ func (s *rpcServer) newCodec(contentType string) (codec.NewCodec, error) {
 	return nil, fmt.Errorf("Unsupported Content-Type: %s", contentType)
 }
 
-func (s *rpcServer) Config() options {
+func (s *rpcServer) Options() Options {
 	s.RLock()
 	opts := s.opts
 	s.RUnlock()
@@ -110,8 +110,8 @@ func (s *rpcServer) Init(opts ...Option) {
 	for _, opt := range opts {
 		opt(&s.opts)
 	}
-	if len(s.opts.id) == 0 {
-		s.opts.id = s.opts.name + "-" + DefaultId
+	if len(s.opts.Id) == 0 {
+		s.opts.Id = s.opts.Name + "-" + DefaultId
 	}
 	s.Unlock()
 }
@@ -159,17 +159,17 @@ func (s *rpcServer) Subscribe(sb Subscriber) error {
 
 func (s *rpcServer) Register() error {
 	// parse address for host, port
-	config := s.Config()
+	config := s.Options()
 	var advt, host string
 	var port int
 
 	// check the advertise address first
 	// if it exists then use it, otherwise
 	// use the address
-	if len(config.Advertise()) > 0 {
-		advt = config.Advertise()
+	if len(config.Advertise) > 0 {
+		advt = config.Advertise
 	} else {
-		advt = config.Address()
+		advt = config.Address
 	}
 
 	parts := strings.Split(advt, ":")
@@ -187,13 +187,13 @@ func (s *rpcServer) Register() error {
 
 	// register service
 	node := &registry.Node{
-		Id:       config.Id(),
+		Id:       config.Id,
 		Address:  addr,
 		Port:     port,
-		Metadata: config.Metadata(),
+		Metadata: config.Metadata,
 	}
 
-	node.Metadata["transport"] = config.transport.String()
+	node.Metadata["transport"] = config.Transport.String()
 
 	s.RLock()
 	var endpoints []*registry.Endpoint
@@ -206,14 +206,14 @@ func (s *rpcServer) Register() error {
 	s.RUnlock()
 
 	service := &registry.Service{
-		Name:      config.Name(),
-		Version:   config.Version(),
+		Name:      config.Name,
+		Version:   config.Version,
 		Nodes:     []*registry.Node{node},
 		Endpoints: endpoints,
 	}
 
 	log.Infof("Registering node: %s", node.Id)
-	if err := config.registry.Register(service); err != nil {
+	if err := config.Registry.Register(service); err != nil {
 		return err
 	}
 
@@ -222,7 +222,7 @@ func (s *rpcServer) Register() error {
 
 	for sb, _ := range s.subscribers {
 		handler := s.createSubHandler(sb, s.opts)
-		sub, err := config.broker.Subscribe(sb.Topic(), handler)
+		sub, err := config.Broker.Subscribe(sb.Topic(), handler)
 		if err != nil {
 			return err
 		}
@@ -233,17 +233,17 @@ func (s *rpcServer) Register() error {
 }
 
 func (s *rpcServer) Deregister() error {
-	config := s.Config()
+	config := s.Options()
 	var advt, host string
 	var port int
 
 	// check the advertise address first
 	// if it exists then use it, otherwise
 	// use the address
-	if len(config.Advertise()) > 0 {
-		advt = config.Advertise()
+	if len(config.Advertise) > 0 {
+		advt = config.Advertise
 	} else {
-		advt = config.Address()
+		advt = config.Address
 	}
 
 	parts := strings.Split(advt, ":")
@@ -260,19 +260,19 @@ func (s *rpcServer) Deregister() error {
 	}
 
 	node := &registry.Node{
-		Id:      config.Id(),
+		Id:      config.Id,
 		Address: addr,
 		Port:    port,
 	}
 
 	service := &registry.Service{
-		Name:    config.Name(),
-		Version: config.Version(),
+		Name:    config.Name,
+		Version: config.Version,
 		Nodes:   []*registry.Node{node},
 	}
 
 	log.Infof("Deregistering node: %s", node.Id)
-	if err := config.registry.Deregister(service); err != nil {
+	if err := config.Registry.Deregister(service); err != nil {
 		return err
 	}
 
@@ -290,16 +290,16 @@ func (s *rpcServer) Deregister() error {
 
 func (s *rpcServer) Start() error {
 	registerHealthChecker(s)
-	config := s.Config()
+	config := s.Options()
 
-	ts, err := config.transport.Listen(config.address)
+	ts, err := config.Transport.Listen(config.Address)
 	if err != nil {
 		return err
 	}
 
 	log.Infof("Listening on %s", ts.Addr())
 	s.Lock()
-	s.opts.address = ts.Addr()
+	s.opts.Address = ts.Addr()
 	s.Unlock()
 
 	go ts.Accept(s.accept)
@@ -307,11 +307,11 @@ func (s *rpcServer) Start() error {
 	go func() {
 		ch := <-s.exit
 		ch <- ts.Close()
-		config.broker.Disconnect()
+		config.Broker.Disconnect()
 	}()
 
 	// TODO: subscribe to cruft
-	return config.broker.Connect()
+	return config.Broker.Connect()
 }
 
 func (s *rpcServer) Stop() error {

server/server.go

@@ -39,7 +39,7 @@ import (
 )
 
 type Server interface {
-	Config() options
+	Options() Options
 	Init(...Option)
 	Handle(Handler) error
 	NewHandler(interface{}) Handler
@@ -80,7 +80,7 @@ type Streamer interface {
 	Close() error
 }
 
-type Option func(*options)
+type Option func(*Options)
 
 var (
 	DefaultAddress        = ":0"
@@ -91,8 +91,8 @@ var (
 )
 
 // Returns config options for the default service
-func Config() options {
-	return DefaultServer.Config()
+func DefaultOptions() Options {
+	return DefaultServer.Options()
 }
 
 // Initialises the default server with options passed in
@@ -174,8 +174,8 @@ func Run() error {
 
 // Starts the default server
 func Start() error {
-	config := DefaultServer.Config()
-	log.Infof("Starting server %s id %s", config.Name(), config.Id())
+	config := DefaultServer.Options()
+	log.Infof("Starting server %s id %s", config.Name, config.Id)
 	return DefaultServer.Start()
 }
 

server/subscriber.go

@@ -154,7 +154,7 @@ func validateSubscriber(sub Subscriber) error {
 	return nil
 }
 
-func (s *rpcServer) createSubHandler(sb *subscriber, opts options) broker.Handler {
+func (s *rpcServer) createSubHandler(sb *subscriber, opts Options) broker.Handler {
 	return func(p broker.Publication) error {
 		msg := p.Message()
 		ct := msg.Header["Content-Type"]
@@ -216,8 +216,8 @@ func (s *rpcServer) createSubHandler(sb *subscriber, opts options) broker.Handle
 				return nil
 			}
 
-			for i := len(opts.subWrappers); i > 0; i-- {
-				fn = opts.subWrappers[i-1](fn)
+			for i := len(opts.SubWrappers); i > 0; i-- {
+				fn = opts.SubWrappers[i-1](fn)
 			}
 
 			go fn(ctx, &rpcPublication{