From 4c3b770b279a261a0ddbaa1df5de47d7faca5be7 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 19 Dec 2017 20:57:09 -0500
Subject: [PATCH 1/2] bump to sbt 1.0.4

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 94005e587..394cb75cf 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.0
+sbt.version=1.0.4

From 06ffb4f4406156e423ba7135178a45aa5f72b099 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 19 Dec 2017 21:01:02 -0500
Subject: [PATCH 2/2] warn about multiple instance once

Fixes #3823

When you launch a second instance of sbt on a build, prior to this change it was displaying `java.io.IOException: sbt server is already running` on every command. This make it a bit less aggressive, and just display a warning once.

```
[warn] Is another instance of sbt is running on this build?
[warn] Running multiple instances is unsupported
```
---
 .../main/scala/sbt/internal/server/Server.scala  |  4 +++-
 .../scala/sbt/internal/CommandExchange.scala     | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala
index 4fb8a7cb4..521c8d399 100644
--- a/main-command/src/main/scala/sbt/internal/server/Server.scala
+++ b/main-command/src/main/scala/sbt/internal/server/Server.scala
@@ -97,7 +97,7 @@ private[sbt] object Server {
             case Failure(e) => ()
             case Success(socket) =>
               socket.close()
-              throw new IOException("sbt server is already running.")
+              throw new AlreadyRunningException()
           }
         } else ()
       }
@@ -210,3 +210,5 @@ private[sbt] case class ServerConnection(
     }
   }
 }
+
+private[sbt] class AlreadyRunningException extends IOException("sbt server is already running.")
diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index 39259ee28..acbe78bb6 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -10,7 +10,7 @@ package internal
 
 import java.io.IOException
 import java.util.concurrent.ConcurrentLinkedQueue
-import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic._
 import scala.collection.mutable.ListBuffer
 import scala.annotation.tailrec
 import BasicKeys.{
@@ -48,6 +48,7 @@ private[sbt] final class CommandExchange {
   } getOrElse true
   private val lock = new AnyRef {}
   private var server: Option[ServerInstance] = None
+  private val firstInstance: AtomicBoolean = new AtomicBoolean(true)
   private var consoleChannel: Option[ConsoleChannel] = None
   private val commandQueue: ConcurrentLinkedQueue[Exec] = new ConcurrentLinkedQueue()
   private val channelBuffer: ListBuffer[CommandChannel] = new ListBuffer()
@@ -90,7 +91,6 @@ private[sbt] final class CommandExchange {
     else s
   }
 
-  private def newChannelName: String = s"channel-${nextChannelId.incrementAndGet()}"
   private def newNetworkName: String = s"network-${nextChannelId.incrementAndGet()}"
 
   /**
@@ -132,7 +132,8 @@ private[sbt] final class CommandExchange {
       subscribe(channel)
     }
     server match {
-      case Some(_) => // do nothing
+      case Some(_)                    => // do nothing
+      case None if !firstInstance.get => // there's another server
       case _ =>
         val portfile = (new File(".")).getAbsoluteFile / "project" / "target" / "active.json"
         val h = Hash.halfHashString(IO.toURI(portfile).toString)
@@ -154,6 +155,11 @@ private[sbt] final class CommandExchange {
           case Some(Success(_)) =>
             // rememeber to shutdown only when the server comes up
             server = Some(x)
+          case Some(Failure(e: AlreadyRunningException)) =>
+            s.log.warn("sbt server could not start because there's another instance of sbt running on this build.")
+            s.log.warn("Running multiple instances is unsupported")
+            server = None
+            firstInstance.set(false)
           case Some(Failure(e)) =>
             s.log.error(e.toString)
             server = None
@@ -191,6 +197,7 @@ private[sbt] final class CommandExchange {
       case xs =>
         lock.synchronized {
           channelBuffer --= xs
+          ()
         }
     }
   }
@@ -247,6 +254,7 @@ private[sbt] final class CommandExchange {
       case xs =>
         lock.synchronized {
           channelBuffer --= xs
+          ()
         }
     }
   }
@@ -288,6 +296,7 @@ private[sbt] final class CommandExchange {
       case xs =>
         lock.synchronized {
           channelBuffer --= xs
+          ()
         }
     }
   }
@@ -339,6 +348,7 @@ private[sbt] final class CommandExchange {
       case xs =>
         lock.synchronized {
           channelBuffer --= xs
+          ()
         }
     }
   }