Skip to content

Commit 2e94633

Browse files
committed
Fix LogBack message
1 parent 797d35c commit 2e94633

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/main/scala/gitbucket/monitoring/models/LogBack.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import gitbucket.monitoring.utils._
88
object LogBack {
99
val enableLogging = Java.getSystemProperties.contains("logback.configurationFile")
1010
val confPath = Java.getSystemProperties.getOrElse("logback.configurationFile", "Can not find logback settings.xml")
11+
val notFoundMessage = "Can not find logback settings.xml"
12+
val dosentConfigureMessage = "Dosen't configure Logback"
1113
def getLogBackSettings: Either[String, String] = {
1214
if (enableLogging) {
1315
try {
@@ -19,7 +21,7 @@ object LogBack {
1921
case e: Exception => Left(Message.error)
2022
}
2123
} else {
22-
Left("Dosen't configure Logback")
24+
Left(dosentConfigureMessage)
2325
}
2426
}
2527
def getLogBackInfo: LogBackInfo = {
@@ -43,13 +45,13 @@ object LogBack {
4345
case e: Exception => Left(Message.error)
4446
}
4547
} else {
46-
Left("Dosen't configure Logback")
48+
Left(dosentConfigureMessage)
4749
}
4850
}
4951

5052
LogBackInfo(
5153
Java.getSystemProperties.contains("logback.configurationFile"),
52-
Java.getSystemProperties.getOrElse("logback.configurationFile", "Can not find logback settings.xml"),
54+
Java.getSystemProperties.getOrElse("logback.configurationFile", notFoundMessage),
5355
logFilePath
5456
)
5557
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
@(message: String)(implicit context: gitbucket.core.controller.Context)
22
@import gitbucket.monitoring.utils.Message
33
@import gitbucket.monitoring.models.GitBucketLog
4+
@import gitbucket.monitoring.models.LogBack
45
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
56
@message match {
67
case Message.notSupported => { <div class="error"> @message </div> }
78
case Message.error => { <div class="error"> @message </div> }
89
case Message.notFound => { <div class="error"> @message </div> }
910
case GitBucketLog.disableMessage => { <div class="error"> @message </div> }
11+
case LogBack.notFoundMessage => { <div class="error"> @message </div> }
12+
case LogBack.dosentConfigureMessage => { <div class="error"> @message </div> }
1013
case _ => { @message }
1114
}

0 commit comments

Comments
 (0)