diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-24 21:03:58 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-24 21:03:58 -0800 |
| commit | 880037447664511bf430050d6709a30bec728437 (patch) | |
| tree | ab08dc8c805ed894d0a3081fd9f1de4cb6fbaea6 /clientserver/src | |
| parent | 0768db2c44952ff97348f5b1aebfd423ca868b33 (diff) | |
| download | mill-880037447664511bf430050d6709a30bec728437.tar.gz mill-880037447664511bf430050d6709a30bec728437.tar.bz2 mill-880037447664511bf430050d6709a30bec728437.zip | |
Fix `-w` using the new client-server mode
Diffstat (limited to 'clientserver/src')
| -rw-r--r-- | clientserver/src/mill/clientserver/Server.scala | 4 |
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() |