From 68eff826e9d411ae862edacb57dc80249d23c4b0 Mon Sep 17 00:00:00 2001 From: David Bartley Date: Mon, 29 Jun 2015 23:57:50 -0700 Subject: [PATCH] Ensure flags are parsed before calling bind.Default(). Tested by running `./example -bind localhost:1234`. --- serve.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/serve.go b/serve.go index a09d1d4..da73a9b 100644 --- a/serve.go +++ b/serve.go @@ -24,20 +24,24 @@ func init() { // Serve starts Goji using reasonable defaults. func Serve() { + if !flag.Parsed() { + flag.Parse() + } + ServeListener(bind.Default()) } // Like Serve, but enables TLS using the given config. func ServeTLS(config *tls.Config) { + if !flag.Parsed() { + flag.Parse() + } + ServeListener(tls.NewListener(bind.Default(), config)) } // Like Serve, but runs Goji on top of an arbitrary net.Listener. func ServeListener(listener net.Listener) { - if !flag.Parsed() { - flag.Parse() - } - DefaultMux.Compile() // Install our handler at the root of the standard net/http default mux. // This allows packages like expvar to continue working as expected.