github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1068 from weaveworks/1060-flag-consistency

Browse Source 
Fix up some flags
This commit is contained in:
Paul Bellamy
2016-03-01 13:57:06 +00:00
parent 3e611f8986 7711fe06d9
commit 19844d3c27
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/entrypoint.sh
View File

@@ -33,10 +33,10 @@ while true; do
APP_ARGS="$APP_ARGS -log.level=debug"
PROBE_ARGS="$PROBE_ARGS -log.level=debug"
;;
--no-app|--app-only)
--no-app|--probe-only)
touch /etc/service/app/down
;;
--no-probe|--probe-only)
--no-probe|--app-only)
touch /etc/service/probe/down
;;
--weave.hostname*)

8
prog/probe.go
View File

@@ -81,8 +81,8 @@ func probeMain() {
kubernetesAPI = flag.String("kubernetes.api", "", "Address of kubernetes master api")
kubernetesInterval = flag.Duration("kubernetes.interval", 10*time.Second, "how often to do a full resync of the kubernetes data")
weaveRouterAddr = flag.String("weave.router.addr", "127.0.0.1:6784", "IP address & port of the Weave router")
weaveDNSTarget = flag.String("weave.hostname", fmt.Sprintf("scope.weave.local:%d", xfer.AppPort), "Hostname to lookup in weaveDNS")
weaveAddr = flag.String("weave.addr", "127.0.0.1:6784", "IP address & port of the Weave router")
weaveDNSTarget = flag.String("weave.hostname", fmt.Sprintf("scope.weave.local:%d", xfer.AppPort), "Hostname to lookup in weaveDNS")
)
flag.Parse()
@@ -169,8 +169,8 @@ func probeMain() {
}
}
if *weaveRouterAddr != "" {
client := weave.NewClient(sanitize.URL("http://", 6784, "")(*weaveRouterAddr))
if *weaveAddr != "" {
client := weave.NewClient(sanitize.URL("http://", 6784, "")(*weaveAddr))
weave := overlay.NewWeave(hostID, client)
defer weave.Stop()
p.AddTagger(weave)