Skip to content
Open
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var procs []*procInfo
var procfile = flag.String("f", "Procfile", "proc file")

// rpc port number.
var port = flag.Uint("p", defaultPort(), "port")
var port = flag.Uint("p", defaultPort(0), "port")

var startRPCServer = flag.Bool("rpc-server", true, "Start an RPC server listening on "+defaultAddr())

Expand Down Expand Up @@ -180,7 +180,7 @@ func defaultServer(serverPort uint) string {
if s, ok := os.LookupEnv("GOREMAN_RPC_SERVER"); ok {
return s
}
return fmt.Sprintf("127.0.0.1:%d", defaultPort())
return fmt.Sprintf("127.0.0.1:%d", defaultPort(serverPort))
}

func defaultAddr() string {
Expand All @@ -191,14 +191,17 @@ func defaultAddr() string {
}

// default port
func defaultPort() uint {
func defaultPort(serverPort uint) uint {
s := os.Getenv("GOREMAN_RPC_PORT")
if s != "" {
i, err := strconv.Atoi(s)
if err == nil {
return uint(i)
}
}
if serverPort > 0 {
return serverPort
}
return 8555
}

Expand Down