From 1a82943db245db398c250c08871b25009f029cc1 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sat, 11 Jul 2015 12:00:11 -0600 Subject: [PATCH] core: Simplify Server initializer --- main.go | 2 +- server/server.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 38c7d6bc0..498a5eab1 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,7 @@ func main() { // Start each server with its one or more configurations for addr, configs := range addresses { - s, err := server.New(addr.String(), configs, configs[0].TLS.Enabled) + s, err := server.New(addr.String(), configs) if err != nil { log.Fatal(err) } diff --git a/server/server.go b/server/server.go index 4a751de67..ad15ac31e 100644 --- a/server/server.go +++ b/server/server.go @@ -29,7 +29,12 @@ type Server struct { // New creates a new Server which will bind to addr and serve // the sites/hosts configured in configs. This function does // not start serving. -func New(addr string, configs []Config, tls bool) (*Server, error) { +func New(addr string, configs []Config) (*Server, error) { + var tls bool + if len(configs) > 0 { + tls = configs[0].TLS.Enabled + } + s := &Server{ address: addr, tls: tls,