Skip to content
This repository was archived by the owner on Sep 22, 2020. It is now read-only.

torusd: add peer-address to http scheme by default #325

Open
nak3 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −18
Open

torusd: add peer-address to http scheme by default #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions cmd/torusd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -262,3 +255,11 @@ func doAutojoin(s *torus.Server) error {
return err
}
}

func addrToUri(addr string) (*url.URL, error) {
Copy link
Contributor

@xiang90 xiang90 Dec 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a fan of moving util code to cmd main.go. but we do not have any internal util pkg now.

opinions? @barakmich @lpabon

if strings.Contains(addr, "://") {
// Looks like a full uri
return url.Parse(addr)
}
return url.Parse("http://" + addr)
}
9 changes: 0 additions & 9 deletions distributor/replication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package distributor

import (
"net/url"
"strings"

"github.com/coreos/torus"

Expand Down Expand Up @@ -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)
}