Skip to content

Commit

Permalink
combine CLI options "ip" and "port" to "address"
Browse files Browse the repository at this point in the history
simplifying master command line options
  • Loading branch information
chrislusf committed Feb 14, 2016
1 parent a584a73 commit 7a07ad2
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions glow.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ import (
var (
app = kingpin.New("glow", "A command-line net channel.")

master = app.Command("master", "Start a master process")
masterPort = master.Flag("port", "listening port").Default("8930").Int()
masterIp = master.Flag("ip", "listening IP adress").Default("").String()
masterCerts = netchan.CertFiles{}
master = app.Command("master", "Start a master process")
masterAddress = master.Flag("address", "listening address host:port").Default(":8930").String()
masterCerts = netchan.CertFiles{}

agent = app.Command("agent", "Channel Agent")
agentOption = &a.AgentServerOption{
Expand Down Expand Up @@ -75,8 +74,8 @@ func main() {

switch kingpin.MustParse(app.Parse(os.Args[1:])) {
case master.FullCommand():
println("listening on", (*masterIp)+":"+strconv.Itoa(*masterPort))
m.RunMaster(masterCerts.MakeTLSConfig(), (*masterIp)+":"+strconv.Itoa(*masterPort))
println("listening on", *masterAddress)
m.RunMaster(masterCerts.MakeTLSConfig(), *masterAddress)
case sender.FullCommand():
tlsConfig := senderCerts.MakeTLSConfig()
util.SetupHttpClient(tlsConfig)
Expand Down

0 comments on commit 7a07ad2

Please sign in to comment.