NewXXX always returns without error
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
parent
b7c0506538
commit
19e0b3a721
12
registry.go
12
registry.go
@ -30,7 +30,7 @@ type rtr struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewRouter creates new router and returns it
|
// NewRouter creates new router and returns it
|
||||||
func NewRouter(opts ...router.Option) (router.Router, error) {
|
func NewRouter(opts ...router.Option) router.Router {
|
||||||
// get default options
|
// get default options
|
||||||
options := router.DefaultOptions()
|
options := router.DefaultOptions()
|
||||||
|
|
||||||
@ -45,17 +45,13 @@ func NewRouter(opts ...router.Option) (router.Router, error) {
|
|||||||
initChan: make(chan bool),
|
initChan: make(chan bool),
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.Registry == nil {
|
|
||||||
return nil, fmt.Errorf("registry not set")
|
|
||||||
}
|
|
||||||
|
|
||||||
// create the new table, passing the fetchRoute method in as a fallback if
|
// create the new table, passing the fetchRoute method in as a fallback if
|
||||||
// the table doesn't contain the result for a query.
|
// the table doesn't contain the result for a query.
|
||||||
r.table = newTable(r.lookup)
|
r.table = newTable(r.lookup)
|
||||||
|
|
||||||
// start the router
|
// start the router
|
||||||
r.start()
|
r.start()
|
||||||
return r, nil
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
// Init initializes router with given options
|
// Init initializes router with given options
|
||||||
@ -66,6 +62,10 @@ func (r *rtr) Init(opts ...router.Option) error {
|
|||||||
}
|
}
|
||||||
r.Unlock()
|
r.Unlock()
|
||||||
|
|
||||||
|
if r.options.Registry == nil {
|
||||||
|
return fmt.Errorf("registry not set")
|
||||||
|
}
|
||||||
|
|
||||||
// push a message to the init chan so the watchers
|
// push a message to the init chan so the watchers
|
||||||
// can reset in the case the registry was changed
|
// can reset in the case the registry was changed
|
||||||
go func() {
|
go func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user