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

Fix duplicate registraton of sub handler

Browse Source
This commit is contained in:
Asim 2016-03-22 18:02:50 +00:00
parent f10935ad2e
commit 97860a0488
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
broker/http_broker.go
View File

@ -36,6 +36,8 @@ type httpBroker struct {
unsubscribe chan *httpSubscriber unsubscribe chan *httpSubscriber
opts Options opts Options
mux *http.ServeMux
c *http.Client c *http.Client
r registry.Registry r registry.Registry
@ -111,7 +113,7 @@ func newHttpBroker(opts ...Option) Broker {
reg = registry.DefaultRegistry reg = registry.DefaultRegistry
} }
return &httpBroker{ h := &httpBroker{
id: "broker-" + uuid.NewUUID().String(), id: "broker-" + uuid.NewUUID().String(),
address: addr, address: addr,
opts: options, opts: options,
@ -120,7 +122,11 @@ func newHttpBroker(opts ...Option) Broker {
subscribers: make(map[string][]*httpSubscriber), subscribers: make(map[string][]*httpSubscriber),
unsubscribe: make(chan *httpSubscriber), unsubscribe: make(chan *httpSubscriber),
exit: make(chan chan error), exit: make(chan chan error),
mux: http.NewServeMux(),
} }
h.mux.Handle(DefaultSubPath, h)
return h
} }
func (h *httpPublication) Ack() error { func (h *httpPublication) Ack() error {
@ -220,7 +226,7 @@ func (h *httpBroker) start() error {
log.Printf("Broker Listening on %s", l.Addr().String()) log.Printf("Broker Listening on %s", l.Addr().String())
h.address = l.Addr().String() h.address = l.Addr().String()
go http.Serve(l, h) go http.Serve(l, h.mux)
go h.run(l) go h.run(l)
h.running = true h.running = true
@ -318,7 +324,6 @@ func (h *httpBroker) Init(opts ...Option) error {
h.r = reg h.r = reg
http.Handle(DefaultSubPath, h)
return nil return nil
} }