From 45b0deecedecbad2f25af025c25fd1cc41b1d8d6 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 1 Aug 2020 15:58:28 +0200 Subject: [PATCH] Print solr url on start This is useful info to see which url has been selected, same as db connection. --- modules/common/src/main/scala/docspell/common/Banner.scala | 4 +++- modules/joex/src/main/scala/docspell/joex/Main.scala | 3 ++- .../restserver/src/main/scala/docspell/restserver/Main.scala | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/common/src/main/scala/docspell/common/Banner.scala b/modules/common/src/main/scala/docspell/common/Banner.scala index 8f8ccac3..52d1f7a0 100644 --- a/modules/common/src/main/scala/docspell/common/Banner.scala +++ b/modules/common/src/main/scala/docspell/common/Banner.scala @@ -7,7 +7,8 @@ case class Banner( jdbcUrl: LenientUri, configFile: Option[String], appId: Ident, - baseUrl: LenientUri + baseUrl: LenientUri, + ftsUrl: Option[LenientUri] ) { private val banner = @@ -27,6 +28,7 @@ case class Banner( s"Id: ${appId.id}", s"Base-Url: ${baseUrl.asString}", s"Database: ${jdbcUrl.asString}", + s"Fts: ${ftsUrl.map(_.asString).getOrElse("-")}", s"Config: ${configFile.getOrElse("")}", "" ) diff --git a/modules/joex/src/main/scala/docspell/joex/Main.scala b/modules/joex/src/main/scala/docspell/joex/Main.scala index 8a1890f5..589fb3ae 100644 --- a/modules/joex/src/main/scala/docspell/joex/Main.scala +++ b/modules/joex/src/main/scala/docspell/joex/Main.scala @@ -46,7 +46,8 @@ object Main extends IOApp { cfg.jdbc.url, Option(System.getProperty("config.file")), cfg.appId, - cfg.baseUrl + cfg.baseUrl, + Some(cfg.fullTextSearch.solr.url).filter(_ => cfg.fullTextSearch.enabled) ) logger.info(s"\n${banner.render("***>")}") val pools = for { diff --git a/modules/restserver/src/main/scala/docspell/restserver/Main.scala b/modules/restserver/src/main/scala/docspell/restserver/Main.scala index 93e8b93d..5c089b06 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/Main.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/Main.scala @@ -46,7 +46,8 @@ object Main extends IOApp { cfg.backend.jdbc.url, Option(System.getProperty("config.file")), cfg.appId, - cfg.baseUrl + cfg.baseUrl, + Some(cfg.fullTextSearch.solr.url).filter(_ => cfg.fullTextSearch.enabled) ) val pools = for { cec <- connectEC