summaryrefslogtreecommitdiff
path: root/clientserver/src
diff options
context:
space:
mode:
Diffstat (limited to 'clientserver/src')
-rw-r--r--clientserver/src/mill/clientserver/Server.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/clientserver/src/mill/clientserver/Server.scala b/clientserver/src/mill/clientserver/Server.scala
index de8097fb..2b8ad39f 100644
--- a/clientserver/src/mill/clientserver/Server.scala
+++ b/clientserver/src/mill/clientserver/Server.scala
@@ -19,7 +19,6 @@ trait ServerMain[T]{
def main0(args: Array[String],
stateCache: Option[T],
mainInteractive: Boolean,
- watchInterrupted: () => Boolean,
stdin: InputStream,
stdout: PrintStream,
stderr: PrintStream): (Boolean, Option[T])
@@ -73,7 +72,6 @@ class Server[T](lockBase: String,
args,
sm.stateCache,
interactive,
- () => !locks.clientLock.probe(),
socketIn,
stdout, stderr
)
@@ -98,6 +96,8 @@ class Server[T](lockBase: String,
Thread.sleep(3)
}
+ if (!done) interruptServer()
+
t.interrupt()
t.stop()
clientSocket.close()