server: drop Internal option

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-04-20 12:39:33 +03:00
parent 41837a67f8
commit 3a60103aed
2 changed files with 3 additions and 30 deletions

View File

@ -160,22 +160,16 @@ func (n *noopServer) Register() error {
n.RLock() n.RLock()
// Maps are ordered randomly, sort the keys for consistency // Maps are ordered randomly, sort the keys for consistency
var handlerList []string var handlerList []string
for n, e := range n.handlers { for n, _ := range n.handlers {
// Only advertise non internal handlers
if !e.Options().Internal {
handlerList = append(handlerList, n) handlerList = append(handlerList, n)
} }
}
sort.Strings(handlerList) sort.Strings(handlerList)
var subscriberList []*subscriber var subscriberList []*subscriber
for e := range n.subscribers { for e := range n.subscribers {
// Only advertise non internal subscribers
if !e.Options().Internal {
subscriberList = append(subscriberList, e) subscriberList = append(subscriberList, e)
} }
}
sort.Slice(subscriberList, func(i, j int) bool { sort.Slice(subscriberList, func(i, j int) bool {
return subscriberList[i].topic > subscriberList[j].topic return subscriberList[i].topic > subscriberList[j].topic
}) })

View File

@ -325,8 +325,6 @@ type HandlerOptions struct {
Context context.Context Context context.Context
// Metadata for hondler // Metadata for hondler
Metadata map[string]metadata.Metadata Metadata map[string]metadata.Metadata
// Internal flag limits exporting to other nodes via register
Internal bool
} }
// NewHandlerOptions creates new HandlerOptions // NewHandlerOptions creates new HandlerOptions
@ -354,8 +352,6 @@ type SubscriberOptions struct {
Queue string Queue string
// AutoAck flag for auto ack messages after processing // AutoAck flag for auto ack messages after processing
AutoAck bool AutoAck bool
// Internal flag limit exporting info via register
Internal bool
// BodyOnly flag specifies that message without headers // BodyOnly flag specifies that message without headers
BodyOnly bool BodyOnly bool
} }
@ -382,23 +378,6 @@ func EndpointMetadata(name string, md metadata.Metadata) HandlerOption {
} }
} }
// InternalHandler options specifies that a handler is not advertised
// to the discovery system. In the future this may also limit request
// to the internal network or authorised user.
func InternalHandler(b bool) HandlerOption {
return func(o *HandlerOptions) {
o.Internal = b
}
}
// InternalSubscriber options specifies that a subscriber is not advertised
// to the discovery system.
func InternalSubscriber(b bool) SubscriberOption {
return func(o *SubscriberOptions) {
o.Internal = b
}
}
// DisableAutoAck will disable auto acking of messages // DisableAutoAck will disable auto acking of messages
// after they have been handled. // after they have been handled.
func DisableAutoAck() SubscriberOption { func DisableAutoAck() SubscriberOption {