From 884a7d6a1b86e7af562993af3b2dedf04e88120c Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 8 Jan 2014 13:56:29 +0100 Subject: [PATCH] Default to running GUI on 127.0.0.1:8080 --- gui.go | 5 ++++- main.go | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gui.go b/gui.go index 1ea75b1f..200f96c1 100644 --- a/gui.go +++ b/gui.go @@ -29,7 +29,10 @@ func startGUI(addr string, m *model.Model) { mr.Use(martini.Recovery()) mr.Action(router.Handle) mr.Map(m) - http.ListenAndServe(addr, mr) + err := http.ListenAndServe(addr, mr) + if err != nil { + warnln("GUI not possible:", err) + } }() } diff --git a/main.go b/main.go index e6a5d8b9..54c151eb 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,8 @@ type Options struct { NoDelete bool `long:"no-delete" description:"Never delete files"` NoSymlinks bool `long:"no-symlinks" description:"Don't follow first level symlinks in the repo"` NoStats bool `long:"no-stats" description:"Don't print model and connection statistics"` - GUIAddr string `long:"gui" description:"GUI listen address" default:"" value-name:"ADDR"` + NoGUI bool `long:"no-gui" description:"Don't start GUI"` + GUIAddr string `long:"gui-addr" description:"GUI listen address" default:"127.0.0.1:8080" value-name:"ADDR"` Discovery DiscoveryOptions `group:"Discovery Options"` Advanced AdvancedOptions `group:"Advanced Options"` Debug DebugOptions `group:"Debugging Options"` @@ -139,7 +140,7 @@ func main() { } // GUI - if opts.GUIAddr != "" { + if !opts.NoGUI && opts.GUIAddr != "" { startGUI(opts.GUIAddr, m) }