better error messages when you run interactive commands without -i

2 files changed, 5 insertions, 8 deletions

diff --git a/clientserver/src/mill/clientserver/ClientServer.scala b/clientserver/src/mill/clientserver/ClientServer.scala
index 84ea2e00..f775f8d6 100644
--- a/clientserver/src/mill/clientserver/ClientServer.scala
+++ b/clientserver/src/mill/clientserver/ClientServer.scala
@@ -48,14 +48,14 @@ object ClientServer{
     }
   }
 
-  def interruptWith[T](millis: Int, close: => Unit)(t: => T): Option[T] = {
+  def interruptWith[T](millis: Int, close: => Unit, t: => T): Option[T] = {
     @volatile var interrupt = true
     @volatile var interrupted = false
     new Thread(() => {
       Thread.sleep(millis)
       if (interrupt) {
-        close
         interrupted = true
+        close
       }
     }).start()
 
diff --git a/clientserver/src/mill/clientserver/Server.scala b/clientserver/src/mill/clientserver/Server.scala
index a40c7cbe..52549f69 100644
--- a/clientserver/src/mill/clientserver/Server.scala
+++ b/clientserver/src/mill/clientserver/Server.scala
@@ -41,13 +41,10 @@ class Server[T](lockBase: String,
         val ioSocket = new UnixDomainServerSocket(ioPath)
         val sockOpt = ClientServer.interruptWith(
           acceptTimeout,
-          {
-            try new UnixDomainSocket(ioPath).close()
-            catch{case e: Throwable => }
-          }
-        ){
+          new UnixDomainSocket(ioPath).close(),
           ioSocket.accept()
-        }
+        )
+
         sockOpt match{
           case None => running = false
           case Some(sock) =>