Merge pull request #2382 from tgodzik/rename-server

improvement: Rename server class so that it's easier to recognize if …
scalacenter · Jul 17, 2024 · d34bb81 · d34bb81
2 parents 71c5273 + 1392c9d
commit d34bb81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/bloop-rifle/src/main/scala/bloop/rifle/internal/Operations.scala b/bloop-rifle/src/main/scala/bloop/rifle/internal/Operations.scala
@@ -140,13 +140,13 @@ object Operations {
 
     val (addressArgs, mainClass, writeOutputToOpt) = address match {
       case BloopRifleConfig.Address.Tcp(host, port) =>
-        (Seq(host, port.toString), "bloop.Server", None)
+        (Seq(host, port.toString), "bloop.BloopServer", None)
       case s: BloopRifleConfig.Address.DomainSocket =>
         val writeOutputToOpt0 =
           if (bloopServerSupportsFileTruncating) Some(s.outputPath)
           else None
 
-        (Seq(s"daemon:${s.path}"), "bloop.Server", writeOutputToOpt0)
+        (Seq(s"daemon:${s.path}"), "bloop.BloopServer", writeOutputToOpt0)
     }
 
     val extraJavaOpts =

diff --git a/frontend/src/main/scala/bloop/Server.scala → ...nd/src/main/scala/bloop/BloopServer.scala b/frontend/src/main/scala/bloop/Server.scala → ...nd/src/main/scala/bloop/BloopServer.scala
@@ -33,9 +33,9 @@ import libdaemonjvm.server._
 import org.slf4j
 import sun.misc.Signal
 
-sealed abstract class Server
+sealed abstract class BloopServer
 
-object Server {
+object BloopServer {
   private def ensureSafeDirectoryExists(dir: Path): Unit =
     if (!Files.exists(dir)) {
       Files.createDirectories(dir)
@@ -46,7 +46,7 @@ object Server {
     }
   private val defaultPort: Int = 8212 // 8100 + 'p'
   def main(args: Array[String]): Unit = {
-    def toPortNumber(userPort: String) = Try(userPort.toInt).getOrElse(Server.defaultPort)
+    def toPortNumber(userPort: String) = Try(userPort.toInt).getOrElse(BloopServer.defaultPort)
     val lockFilesDirOrHostPort = args match {
       case Array() =>
         val dir = bloop.io.Paths.daemonDir.underlying
@@ -285,14 +285,14 @@ object Server {
       new Alias(
         "exit",
         "Kill the bloop server.",
-        classOf[Server]
+        classOf[BloopServer]
       )
     )
     aliasManager.addAlias(
       new Alias(
         "ng-stop",
         "Kill the bloop server.",
-        classOf[Server]
+        classOf[BloopServer]
       )
     )