From 6299f316f1be7e36ddf4a4a81f560aaa69f11c63 Mon Sep 17 00:00:00 2001 From: "Fabrizio (Misto) Milo" Date: Mon, 12 Aug 2013 18:32:05 -0700 Subject: [PATCH] use check util --- etcd.go | 12 +++++++++++- util.go | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/etcd.go b/etcd.go index 5070ed155..2ac2c98a5 100644 --- a/etcd.go +++ b/etcd.go @@ -250,9 +250,19 @@ func dialTimeout(network, addr string) (net.Conn, error) { return net.DialTimeout(network, addr, HTTPTimeout) } +type Etcd struct { + http.Server + url string + scheme string + tls TLSConfig +} + // Start to listen and response client command func startEtcdTransport(info Info, scheme string, tlsConf tls.Config) { - u, _ := url.Parse(info.EtcdURL) + u, err := url.Parse(info.EtcdURL) + if err != nil { + fatalf("invalid url '%s': %s", info.EtcdURL, err) + } infof("etcd server [%s:%s]", info.Name, u) etcdMux := http.NewServeMux() diff --git a/util.go b/util.go index e91315327..682eafb71 100644 --- a/util.go +++ b/util.go @@ -95,6 +95,12 @@ func sanitizeURL(host string, defaultScheme string) string { return p.String() } +func check(err error) { + if err != nil { + fatal(err) + } +} + //-------------------------------------- // Log //--------------------------------------