Browse Source

use check util

Fabrizio (Misto) Milo 12 years ago
parent
commit
6299f316f1
2 changed files with 17 additions and 1 deletions
  1. 11 1
      etcd.go
  2. 6 0
      util.go

+ 11 - 1
etcd.go

@@ -250,9 +250,19 @@ func dialTimeout(network, addr string) (net.Conn, error) {
 	return net.DialTimeout(network, addr, HTTPTimeout)
 	return net.DialTimeout(network, addr, HTTPTimeout)
 }
 }
 
 
+type Etcd struct {
+	http.Server
+	url    string
+	scheme string
+	tls    TLSConfig
+}
+
 // Start to listen and response client command
 // Start to listen and response client command
 func startEtcdTransport(info Info, scheme string, tlsConf tls.Config) {
 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)
 	infof("etcd server [%s:%s]", info.Name, u)
 
 
 	etcdMux := http.NewServeMux()
 	etcdMux := http.NewServeMux()

+ 6 - 0
util.go

@@ -95,6 +95,12 @@ func sanitizeURL(host string, defaultScheme string) string {
 	return p.String()
 	return p.String()
 }
 }
 
 
+func check(err error) {
+	if err != nil {
+		fatal(err)
+	}
+}
+
 //--------------------------------------
 //--------------------------------------
 // Log
 // Log
 //--------------------------------------
 //--------------------------------------