Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nsqlookupd: better API when used as a library #1004

Merged
merged 1 commit into from
Jun 3, 2018
Merged

nsqlookupd: better API when used as a library #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/nsqlookupd/nsqlookupd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,11 @@ func (p *program) Start() error {
options.Resolve(opts, flagSet, cfg)
daemon := nsqlookupd.New(opts)

daemon.Main()
err := daemon.Main()
if err != nil {
log.Fatalf("ERROR: failed to start nsqlookupd: %v", err)
}

p.nsqlookupd = daemon
return nil
}
Expand Down
13 changes: 8 additions & 5 deletions nsqlookupd/nsqlookupd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package nsqlookupd

import (
"fmt"
"log"
"net"
"os"
Expand Down Expand Up @@ -42,18 +43,18 @@ func New(opts *Options) *NSQLookupd {
return n
}

func (l *NSQLookupd) Main() {
// Main starts an instance of nsqlookupd and returns an
// error if there was a problem starting up.
func (l *NSQLookupd) Main() error {
ctx := &Context{l}

tcpListener, err := net.Listen("tcp", l.opts.TCPAddress)
if err != nil {
l.logf(LOG_FATAL, "listen (%s) failed - %s", l.opts.TCPAddress, err)
os.Exit(1)
return fmt.Errorf("listen (%s) failed - %s", l.opts.TCPAddress, err)
}
httpListener, err := net.Listen("tcp", l.opts.HTTPAddress)
if err != nil {
l.logf(LOG_FATAL, "listen (%s) failed - %s", l.opts.HTTPAddress, err)
os.Exit(1)
return fmt.Errorf("listen (%s) failed - %s", l.opts.TCPAddress, err)
}

l.tcpListener = tcpListener
Expand All @@ -67,6 +68,8 @@ func (l *NSQLookupd) Main() {
l.waitGroup.Wrap(func() {
http_api.Serve(httpListener, httpServer, "HTTP", l.logf)
})

return nil
}

func (l *NSQLookupd) RealTCPAddr() *net.TCPAddr {
Expand Down