Permalink
Browse files

Better handling of when the specified port is already in use

  • Loading branch information...
1 parent b520f88 commit 296d218e6704e73b3261bca6f5f72b3569cf899b @spf13 spf13 committed May 15, 2014
Showing with 29 additions and 0 deletions.
  1. +14 −0 commands/server.go
  2. +15 −0 helpers/general.go
View
@@ -15,6 +15,7 @@ package commands
import (
"fmt"
+ "net"
"net/http"
"os"
"strconv"
@@ -56,6 +57,19 @@ func server(cmd *cobra.Command, args []string) {
BaseUrl = "http://" + BaseUrl
}
+ l, err := net.Listen("tcp", ":"+strconv.Itoa(serverPort))
+ if err == nil {
+ l.Close()
+ } else {
+ jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port")
+ sp, err := helpers.FindAvailablePort()
+ if err != nil {
+ jww.ERROR.Println("Unable to find alternative port to use")
+ jww.ERROR.Fatalln(err)
+ }
+ serverPort = sp.Port
+ }
+
if serverAppend {
viper.Set("BaseUrl", strings.TrimSuffix(BaseUrl, "/")+":"+strconv.Itoa(serverPort))
} else {
View
@@ -15,6 +15,8 @@ package helpers
import (
"bytes"
+ "fmt"
+ "net"
"strings"
)
@@ -49,3 +51,16 @@ func StripHTML(s string) string {
}
return output
}
+
+func FindAvailablePort() (*net.TCPAddr, error) {
+ l, err := net.Listen("tcp", ":0")
+ if err == nil {
+ defer l.Close()
+ addr := l.Addr()
+ if a, ok := addr.(*net.TCPAddr); ok {
+ return a, nil
+ }
+ return nil, fmt.Errorf("Unable to obtain a valid tcp port. %v", addr)
+ }
+ return nil, err
+}

0 comments on commit 296d218

Please sign in to comment.