Refactoring : LogBack methods, field, name

Author: yoshinorin

src/main/scala/gitbucket/monitoring/controllers/LogController.scala

@@ -7,7 +7,7 @@ trait LogController extends MonitoringControllerBase {
 
   get("/admin/monitoring/logs/logback")(adminOnly {
     gitbucket.monitoring.information.logs.html.logback(
-      LogBack.getLogBackInfo,
+      LogBack.logBackSettingsFile,
       LogBack.getLogBackSettings
     );
   })

src/main/scala/gitbucket/monitoring/services/GitBucketLog.scala

@@ -10,7 +10,7 @@ object GitBucketLog {
 
   def getDefaultSettings: DefaultSettings = {
     DefaultSettings(
-      LogBack.getLogBackInfo,
+      LogBack.getLogBackSettings,
       1000,
       30000
     )

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

@@ -11,8 +11,7 @@ object LogBack {
   val dosentConfigureMessage = "Dosen't configure Logback."
   val enableLogging = Java.getSystemProperties.contains("logback.configurationFile")
   val confPath = Java.getSystemProperties.getOrElse("logback.configurationFile", notFoundMessage)
-
-  def getLogBackSettings: Either[String, String] = {
+  val logBackSettingsFile: Either[String, String] = {
     if (enableLogging) {
       try {
         val bytes = Files.readAllBytes(Paths.get(confPath))
@@ -27,31 +26,29 @@ object LogBack {
     }
   }
 
-  def getLogBackInfo: LogBackInfo = {
-    val logFilePath: Either[String, String] = {
-      if (enableLogging) {
-        try {
-          val xml = getLogBackSettings match {
-            case Left(message) => message
-            case Right(s) => {
-              (XML.loadString(s) \\ "appender" \ "file" toString).replace("<file>","").replace("</file>","")
-            }
-          }
-          if (xml.trim.length == 0) {
-            Left(Message.notFound)
-          } else {
-            (Right(
-              xml
-            ))
+  val logFilePath: Either[String, String] = {
+    if (enableLogging) {
+      try {
+        val xml = logBackSettingsFile match {
+          case Left(message) => message
+          case Right(s) => {
+            (XML.loadString(s) \\ "appender" \ "file" toString).replace("<file>","").replace("</file>","")
           }
-        } catch {
-          case e: Exception => Left(Message.error)
         }
-      } else {
-        Left(dosentConfigureMessage)
+        if (xml.trim.length == 0) {
+          Left(Message.notFound)
+        } else {
+          Right(xml)
+        }
+      } catch {
+        case e: Exception => Left(Message.error)
       }
+    } else {
+      Left(dosentConfigureMessage)
     }
+  }
 
+  def getLogBackSettings: LogBackInfo = {
     LogBackInfo(
       Java.getSystemProperties.contains("logback.configurationFile"),
       Java.getSystemProperties.getOrElse("logback.configurationFile", notFoundMessage),

src/main/twirl/gitbucket/monitoring/information/logs/logback.scala.html

@@ -1,33 +1,33 @@
-@(logbackInfo: gitbucket.monitoring.models.LogBackInfo,
-  logbackSettings: Either[String, String])(implicit context: gitbucket.core.controller.Context)
+@(logbackSettingsFile: Either[String, String],
+  logbackSettings: gitbucket.monitoring.models.LogBackInfo)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @gitbucket.core.html.main("Monitoring") {
   @gitbucket.core.admin.html.menu("monitoring") {
     @gitbucket.monitoring.html.navigation(context)
     @gitbucket.monitoring.information.logs.html.tab(context)
     @gitbucket.monitoring.html.loading(context)
-    @if(logbackInfo.enableLogging) {
+    @if(logbackSettings.enableLogging) {
       <div class="panel panel-default">
         <div class="panel-body">
           <h6><span class="label label-primary">Enable</span></h6><hr>
           <div class="row">
             <label class="col-md-2">Config file's path</label>
-            <span class="col-md-10">@logbackInfo.confPath</span>
+            <span class="col-md-10">@logbackSettings.confPath</span>
           </div>
           <div class="row">
             <label class="col-md-2">Log file's path</label>
             <span class="col-md-10">
-            @logbackInfo.logFilePath match {
+            @logbackSettings.logFilePath match {
               case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
               case Right(p) => { @p }
             }
             </span>
           </div>
         </div>
       </div>
-      @logbackSettings match {
+      @logbackSettingsFile match {
         case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
-        case Right(s) => { <div class="box-header"><span class="glyphicon glyphicon-file"><span class="label label-default ">@logbackInfo.confPath</span></span></div>
+        case Right(s) => { <div class="box-header"><span class="glyphicon glyphicon-file"><span class="label label-default ">@logbackSettings.confPath</span></span></div>
                            <div class="box-content-bottom"><pre class="prettyprint linenums blob">@s</pre></div>
         }
       }