luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6097 from adpi2/bsp-server 

Detach stdio in BSP server
This commit is contained in:
eugene yokota 2020-11-16 10:55:16 -05:00 committed by GitHub
parent 99c6408e37 c71c9c9227
commit 871eb5b4dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main-command/src/main/scala/sbt/internal/client/BspClient.scala
View File

@ -15,8 +15,8 @@ import sbt.Exit
import sbt.io.syntax._ import sbt.io.syntax._
import sbt.protocol.ClientSocket import sbt.protocol.ClientSocket
import scala.sys.process.Process
import scala.util.control.NonFatal import scala.util.control.NonFatal
import java.lang.ProcessBuilder.Redirect
class BspClient private (sbtServer: Socket) { class BspClient private (sbtServer: Socket) {
private def run(): Exit = Exit(BspClient.bspRun(sbtServer)) private def run(): Exit = Exit(BspClient.bspRun(sbtServer))
@ -90,8 +90,15 @@ object BspClient {
* This instance must be shutdown explicitly via `sbt -client shutdown` * This instance must be shutdown explicitly via `sbt -client shutdown`
*/ */
def forkServer(baseDirectory: File, portfile: File): Unit = { def forkServer(baseDirectory: File, portfile: File): Unit = {
val args = List[String]() val args = List("--detach-stdio")
val launchOpts = List("-Xms2048M", "-Xmx2048M", "-Xss2M") val launchOpts = List(
"-Dfile.encoding=UTF-8",
"-Dsbt.io.virtual=true",
"-Xms1024M",
"-Xmx1024M",
"-Xss4M",
"-XX:ReservedCodeCacheSize=128m"
)
val launcherJarString = sys.props.get("java.class.path") match { val launcherJarString = sys.props.get("java.class.path") match {
case Some(cp) => case Some(cp) =>
@ -102,10 +109,15 @@ object BspClient {
} }
val cmd = "java" :: launchOpts ::: "-jar" :: launcherJarString :: args val cmd = "java" :: launchOpts ::: "-jar" :: launcherJarString :: args
val process = Process(cmd, baseDirectory).run() val processBuilder =
new ProcessBuilder(cmd: _*)
.directory(baseDirectory)
.redirectInput(Redirect.PIPE)
while (process.isAlive() && !portfile.exists) Thread.sleep(100) val process = processBuilder.start()
if (!process.isAlive()) sys.error("sbt server exited") while (process.isAlive && !portfile.exists) Thread.sleep(100)
if (!process.isAlive) sys.error("sbt server exited")
} }
} }