summaryrefslogtreecommitdiffstats
path: root/commands/server.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-02-27 16:58:42 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-02-27 16:58:42 +0100
commit9349a889e2bf6262681164f41c9221a382fd57ae (patch)
treea0a3a67194bc7b68d163377c2b8be1e8fc90f7fc /commands/server.go
parentff4ca992869cdbcc9f2ce06c9a2f9857a0b95910 (diff)
Do not try to find available port if set by user
He/she probably really meant it. Fixes #1901
Diffstat (limited to 'commands/server.go')
-rw-r--r--commands/server.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/commands/server.go b/commands/server.go
index 94d155ab9..53c380991 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -118,6 +118,10 @@ func server(cmd *cobra.Command, args []string) error {
if err == nil {
l.Close()
} else {
+ if flagChanged(serverCmd.Flags(), "port") {
+ // port set explicitly by user -- he/she probably meant it!
+ return newSystemErrorF("Port %d already in use", serverPort)
+ }
jww.ERROR.Println("port", serverPort, "already in use, attempting to use an available port")
sp, err := helpers.FindAvailablePort()
if err != nil {