From 1388c74c2e5c50be655ff4a59299eb8d8012a686 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Tue, 23 Jan 2024 09:51:19 -0300 Subject: [PATCH 1/2] Fix duplicating log message --- .../src/main/scala/org/bigbluebutton/ClientSettings.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala index 53000a6507..7254224129 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala @@ -10,6 +10,7 @@ import scala.util.{ Failure, Success, Try } object ClientSettings extends SystemConfiguration { var clientSettingsFromFile: Map[String, Object] = Map("" -> "") val logger = LoggerFactory.getLogger(this.getClass) + val def loadClientSettingsFromFile() = { val clientSettingsFile = scala.io.Source.fromFile(clientSettingsPath, "UTF-8") @@ -56,7 +57,7 @@ object ClientSettings extends SystemConfiguration { getConfigPropertyValueByPath(map, path) match { case Some(configValue: Int) => configValue case _ => - logger.debug("Config `{}` not found.", path) + logger.debug(s"Config `$path` with type Integer not found in clientSettings.") alternativeValue } } @@ -65,7 +66,7 @@ object ClientSettings extends SystemConfiguration { getConfigPropertyValueByPath(map, path) match { case Some(configValue: String) => configValue case _ => - logger.debug("Config `{}` not found.", path) + logger.debug(s"Config `$path` with type String not found in clientSettings.") alternativeValue } } @@ -74,7 +75,7 @@ object ClientSettings extends SystemConfiguration { getConfigPropertyValueByPath(map, path) match { case Some(configValue: Boolean) => configValue case _ => - logger.debug("Config `{}` not found.", path) + logger.debug(s"Config `$path` with type Boolean found in clientSettings.") alternativeValue } } From 23389010fcad63376ba93cb3de6b0d1d71d375b8 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Tue, 23 Jan 2024 09:52:09 -0300 Subject: [PATCH 2/2] Remove wrong line --- .../src/main/scala/org/bigbluebutton/ClientSettings.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala index 7254224129..1b84d040fd 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala @@ -10,7 +10,6 @@ import scala.util.{ Failure, Success, Try } object ClientSettings extends SystemConfiguration { var clientSettingsFromFile: Map[String, Object] = Map("" -> "") val logger = LoggerFactory.getLogger(this.getClass) - val def loadClientSettingsFromFile() = { val clientSettingsFile = scala.io.Source.fromFile(clientSettingsPath, "UTF-8")