Add options to set ports on weaver command line

[abligh]

This commit adds two command line options, intended to allow multiple
instances of weave to run without container separation between them.

• -port=PORT makes weave bind to port PORT (an integer). Without the
  option, the default value (6783) is used.
• -bindjsonto=BINDSTRING makes weave bind its control interface to
  a different port. For instance "127.0.0.1:6784" can be used to
  bind to localhost only. ":6784" is the default. An empty string
  can be used to disable the control interface.

Signed-off-by: Alex Bligh alex@alex.org.uk

[abligh]

Hmm... travis failed here, just like a build does locally, because weaver/main.go has:

import (
       ....
       weave "github.com/zettio/weave/router"

and of course a build will fail against the github version of weave/router, as this hasn't been merged yet.

Changing this to:

weave "../router"

makes it work fine, but presumably you don't want to merge that.

[rade]

Hmm. Looks like something isn't quite right in our (relatively new) travis setup here. It appears to be pulling down dependencies from git when it should just use the repo it has already checked out. @tomwilkie any idea?

[bboreham]

It's because the name is different in the repo. Fix is in #528

[rade]

I reckon we should move NormalisePeerAddr to Router.NormaliseAddr.

[abligh]

Rade: I fixed all your comments bar this one:

In router/router.go:

@@ -86,8 +88,8 @@ func (router *Router) Start() {
router.Macs.Start()
router.Routes.Start()
router.ConnectionMaker.Start()

• router.UDPListener = router.listenUDP(Port, po)
• router.listenTCP(Port)
• router.UDPListener = router.listenUDP(router.ListenPort, po)
• router.listenTCP(router.ListenPort)

Just use port here, i.e. the method param.

I didn't understand that one. This is in Start(), which takes no parameters. The parameters are passed to NewRouter() (immediately above it).

Travis appears to like the commit now.

[rade]

I didn't understand that one.

Ah sorry, github showed me a diff with a function boundary collapsed, and I didn't realise that.

[rade]

One more thing. The introduction of a dependency of ConnectionMaker on Router (via cm.ourself.Router) is undesirable. So I suggest we pass a function to NewConnectionMaker, stash that in a new ConnectionMaker.normalisePeerAddr field, and invoke that wherever you currently have cm.ourself.Router.NormalisePeerAddr.

[abligh]

I think I've done that, and it works here, but it's now failing the coverage test. I am afraid the reasons it's failing (but wasn't before) are a bit opaque to me.

[rade]

don't worry about the coverage "failure".

[rade]

LGTM!

[abligh]

Fixed