From 4aa89f2e2ed7c4bc4a5e1b489c77cf99bffee174 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Sun, 18 Sep 2016 20:49:26 +0900
Subject: [PATCH] torusd: add peer-address to http scheme by default

---
 cmd/torusd/main.go         | 19 ++++++++++---------
 distributor/replication.go |  9 ---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/cmd/torusd/main.go b/cmd/torusd/main.go
index e9cc742..a2f5bea 100644
--- a/cmd/torusd/main.go
+++ b/cmd/torusd/main.go
@@ -61,7 +61,7 @@ func init() {
 	rootCommand.PersistentFlags().BoolVarP(&debugInit, "debug-init", "", false, "Run a default init for the MDS if one doesn't exist")
 	rootCommand.PersistentFlags().StringVarP(&host, "host", "", "", "Host to listen on for HTTP")
 	rootCommand.PersistentFlags().IntVarP(&port, "port", "", 4321, "Port to listen on for HTTP")
-	rootCommand.PersistentFlags().StringVarP(&peerAddress, "peer-address", "", "", "Address to listen on for intra-cluster data")
+	rootCommand.PersistentFlags().StringVarP(&peerAddress, "peer-address", "", "", "URL (scheme \"http://\"(default) or \"tdp://\") to listen on for intra-cluster data")
 	rootCommand.PersistentFlags().StringVarP(&sizeStr, "size", "", "1GiB", "How much disk space to use for this storage node")
 	rootCommand.PersistentFlags().StringVarP(&logpkg, "logpkg", "", "", "Specific package logging")
 	rootCommand.PersistentFlags().BoolVarP(&autojoin, "auto-join", "", false, "Automatically join the storage pool")
@@ -190,18 +190,11 @@ func runServer(cmd *cobra.Command, args []string) {
 
 	if peerAddress != "" {
 		var u *url.URL
-
-		u, err = url.Parse(peerAddress)
+		u, err = addrToUri(peerAddress)
 		if err != nil {
 			fmt.Printf("Couldn't parse peer address %s: %s\n", peerAddress, err)
 			os.Exit(1)
 		}
-
-		if u.Scheme == "" {
-			fmt.Printf("Peer address %s does not have URL scheme (http:// or tdp://)\n", peerAddress)
-			os.Exit(1)
-		}
-
 		err = distributor.ListenReplication(srv, u)
 	} else {
 		err = distributor.OpenReplication(srv)
@@ -262,3 +255,11 @@ func doAutojoin(s *torus.Server) error {
 		return err
 	}
 }
+
+func addrToUri(addr string) (*url.URL, error) {
+	if strings.Contains(addr, "://") {
+		// Looks like a full uri
+		return url.Parse(addr)
+	}
+	return url.Parse("http://" + addr)
+}
diff --git a/distributor/replication.go b/distributor/replication.go
index 094dca2..cbc5317 100644
--- a/distributor/replication.go
+++ b/distributor/replication.go
@@ -2,7 +2,6 @@ package distributor
 
 import (
 	"net/url"
-	"strings"
 
 	"github.com/coreos/torus"
 
@@ -38,11 +37,3 @@ func openReplication(s *torus.Server, addr *url.URL) error {
 	s.ReplicationOpen = true
 	return nil
 }
-
-func addrToUri(addr string) (*url.URL, error) {
-	if strings.Contains(addr, "://") {
-		// Looks like a full uri
-		return url.Parse(addr)
-	}
-	return url.Parse("http://" + addr)
-}