From c80b8624a84faaa977776e73257f3aec369f4a99 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Thu, 24 Aug 2023 17:45:22 +0100 Subject: [PATCH] Log project manager version on startup (#7646) Looks like that ``` [info] [2023-08-23T13:12:58.119Z] [org.enso.projectmanager.boot.ProjectManager$] Starting Enso Project Manager Version: 0.0.0-dev Built with: scala-2.13.11 for GraalVM 17.0.7 Built from: wip/db/fix-dev-version-check* @ 52bc6b8fcf2efb85cd92a81a32e1e428f9e3e613 Built on: Linux (amd64) ``` --- .../projectmanager/boot/ProjectManager.scala | 16 +++++++++++----- .../org/enso/version/VersionDescription.scala | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/ProjectManager.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/ProjectManager.scala index 39615edf62..a41ff8230e 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/ProjectManager.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/ProjectManager.scala @@ -24,6 +24,7 @@ import zio.{ExitCode, Runtime, Scope, UIO, ZAny, ZIO, ZIOAppArgs, ZIOAppDefault} import java.io.{EOFException, IOException} import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths} import java.util.concurrent.ScheduledThreadPoolExecutor + import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor} @@ -228,7 +229,10 @@ object ProjectManager extends ZIOAppDefault with LazyLogging { } else { val verbosity = options.getOptions.count(_ == Cli.option.verbose) val logMasking = !options.hasOption(Cli.NO_LOG_MASKING) - logger.info("Starting Project Manager...") + logger.info( + "Starting {}", + makeVersionDescription.asString(useJson = false) + ) for { opts <- parseOpts(options) profilingLog = opts.profilingPath.map(getSiblingFile(_, ".log")) @@ -278,14 +282,16 @@ object ProjectManager extends ZIOAppDefault with LazyLogging { private def displayVersion( useJson: Boolean ): ZIO[ZAny, IOException, ExitCode] = { - val versionDescription = VersionDescription.make( + printLine(makeVersionDescription.asString(useJson)) *> + ZIO.succeed(SuccessExitCode) + } + + private def makeVersionDescription: VersionDescription = + VersionDescription.make( "Enso Project Manager", includeRuntimeJVMInfo = false, enableNativeImageOSWorkaround = true ) - printLine(versionDescription.asString(useJson)) *> - ZIO.succeed(SuccessExitCode) - } private def logServerStartup(): UIO[Unit] = ZIO.succeed { diff --git a/lib/scala/version-output/src/main/scala/org/enso/version/VersionDescription.scala b/lib/scala/version-output/src/main/scala/org/enso/version/VersionDescription.scala index e79cce7084..aa78030b5c 100644 --- a/lib/scala/version-output/src/main/scala/org/enso/version/VersionDescription.scala +++ b/lib/scala/version-output/src/main/scala/org/enso/version/VersionDescription.scala @@ -115,7 +115,7 @@ object VersionDescription { | "ref": "${Info.ref}", | "dirty": ${Info.isDirty}, | "commit": "${Info.commit}", - | $runtimeDescription$parameters + |$runtimeDescription$parameters |}""".stripMargin } }