Skip to content

Commit a395c01

Browse files
yoshinorinyoshinorin
committed
Using helper class if message has error
1 parent 1a773c6 commit a395c01

File tree

7 files changed

+29
-25
lines changed

7 files changed

+29
-25
lines changed

‎src/main/twirl/gitbucket/monitoring/helper/coloring.scala.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@(message: String)(implicit context: gitbucket.core.controller.Context)
2+
@import gitbucket.monitoring.utils.Message
3+
@import gitbucket.monitoring.models.GitBucketLog
4+
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
5+
@message match {
6+
case Message.notSupported => { <div class="error"> @message </div> }
7+
case Message.error => { <div class="error"> @message </div> }
8+
case Message.notFound => { <div class="error"> @message </div> }
9+
case GitBucketLog.disableMessage => { <div class="error"> @message </div> }
10+
case _ => { @message }
11+
}

‎src/main/twirl/gitbucket/monitoring/information/environmentValiable.scala.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@import context._
33
@gitbucket.core.html.main("Monitoring") {
44
@gitbucket.core.admin.html.menu("monitoring") {
5-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
65
@gitbucket.monitoring.html.navigation(context)
76
<div class="panel panel-default">
87
<div class="panel-heading strong">Valiables</div>
@@ -15,8 +14,8 @@
1514
<tr>
1615
@env match {
1716
case Left(message) => {
18-
<td> <div class="error"> @message </div> </td>
19-
<td> <div class="error"> @message </div> </td>
17+
<td> @gitbucket.monitoring.helper.html.coloring(message) </td>
18+
<td> @gitbucket.monitoring.helper.html.coloring(message) </td>
2019
}
2120
case Right(v) => {
2221
@for((key, value) <- v.toSeq.sortBy(_._1)) {

‎src/main/twirl/gitbucket/monitoring/information/logs/gitbucketlog.scala.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
@import context._
44
@gitbucket.core.html.main("Monitoring") {
55
@gitbucket.core.admin.html.menu("monitoring") {
6-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
76
@gitbucket.monitoring.html.navigation(context)
87
@gitbucket.monitoring.information.logs.html.tab(context)
98
@gitbucket.monitoring.html.loading(context)
109
@log match {
11-
case Left(message) => { <div class="error"> @message </div> }
10+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
1211
case Right(s) => {
1312
<form id="get-log-from-tail" action="@context.path/admin/monitoring/logs/gitbucketlog" method="get" class="form-inline">
1413
<div class="form-group">
@@ -18,12 +17,12 @@
1817
</div>
1918
</form><br>
2019
@defaultSettings.logBackInfo.logFilePath match {
21-
case Left(message) => { <div class="error"> @message </div> }
20+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
2221
case Right(l) => {
2322
<div class="box-header"><span class="glyphicon glyphicon-file"><span class="label label-default ">@l</span></span></div>
2423
}
2524
}
26-
<div class="box-content-bottom"><pre class="prettyprint linenums blob">@s.log</pre></div>
25+
<div class="box-content-bottom"><pre class="prettyprint linenums blob"> @gitbucket.monitoring.helper.html.coloring(s.log) </pre></div>
2726
}
2827
}
2928
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@import context._
44
@gitbucket.core.html.main("Monitoring") {
55
@gitbucket.core.admin.html.menu("monitoring") {
6-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
76
@gitbucket.monitoring.html.navigation(context)
87
@gitbucket.monitoring.information.logs.html.tab(context)
98
@gitbucket.monitoring.html.loading(context)
@@ -18,14 +17,14 @@ <h6><span class="label label-primary">Enable</span></h6><hr>
1817
<div class="row">
1918
<label class="col-md-2">Log file's path</label>
2019
@logbackInfo.logFilePath match {
21-
case Left(message) => { <div class="error"> @message </div> }
20+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
2221
case Right(p) => { <div> @p </div> }
2322
}
2423
</div>
2524
</div>
2625
</div>
2726
@logbackSettings match {
28-
case Left(message) => { <div class="error"> @message </div> }
27+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
2928
case Right(s) => { <div class="box-header"><span class="glyphicon glyphicon-file"><span class="label label-default ">@logbackInfo.confPath</span></span></div>
3029
<div class="box-content-bottom"><pre class="prettyprint linenums blob">@s</pre></div>
3130
}

‎src/main/twirl/gitbucket/monitoring/information/process.scala.html‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
@import context._
44
@import gitbucket.monitoring.models.OperatingSystem
55
@gitbucket.core.html.main("Monitoring") {
6-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
76
@gitbucket.core.admin.html.menu("monitoring") {
87
@gitbucket.monitoring.html.navigation(context)
9-
@gitbucket.monitoring.html.loading(context)
108
<div class="panel panel-default">
119
<div class="panel-heading strong">Load Average</div>
1210
<div class="panel-body">
1311
@loadAve match {
14-
case Left(message) => { <div class="error"> @message </div> }
12+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
1513
case Right(l) => {
1614
<div class="row">
1715
<div class="col-sm-2">
@@ -21,23 +19,23 @@
2119
case _ => { <div class="panel-heading strong">Recent 1min</div> }
2220
}
2321
<div class="panel-body text-right">
24-
@l.oneMin
22+
@gitbucket.monitoring.helper.html.coloring(l.oneMin)
2523
</div>
2624
</div>
2725
</div>
2826
<div class="col-sm-2">
2927
<div class="panel panel-default">
3028
<div class="panel-heading strong">Recent 5min</div>
3129
<div class="panel-body text-right">
32-
@l.fiveMin
30+
@gitbucket.monitoring.helper.html.coloring(l.fiveMin)
3331
</div>
3432
</div>
3533
</div>
3634
<div class="col-sm-2">
3735
<div class="panel panel-default">
3836
<div class="panel-heading strong">Recent 15min</div>
3937
<div class="panel-body text-right">
40-
@l.fifteenMin
38+
@gitbucket.monitoring.helper.html.coloring(l.fifteenMin)
4139
</div>
4240
</div>
4341
</div>
@@ -50,7 +48,7 @@
5048
<div class="panel-heading strong">Process</div>
5149
<div class="panel-body">
5250
@tasks match {
53-
case Left(message) => { <div class="error"> @message </div> }
51+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
5452
case Right(t) => {
5553
<div class="row">
5654
<div class="col-sm-2">
@@ -65,7 +63,7 @@
6563
<div class="panel panel-default">
6664
<div class="panel-heading strong">Sleeping</div>
6765
<div class="panel-body text-right">
68-
@t.sleeping / @t.total
66+
@t.sleeping / @t.total
6967
</div>
7068
</div>
7169
</div>

‎src/main/twirl/gitbucket/monitoring/information/resources.scala.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
diskSpace: gitbucket.monitoring.models.DiskSpace)(implicit context: gitbucket.core.controller.Context)
66
@import context._
77
@gitbucket.core.html.main("Monitoring") {
8-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
98
@gitbucket.core.admin.html.menu("monitoring") {
109
@gitbucket.monitoring.html.navigation(context)
1110
<div class="panel panel-default">
@@ -23,7 +22,7 @@
2322
<div class="panel-heading strong">Used</div>
2423
<div class="panel-body text-right">
2524
@cpu match {
26-
case Left(message) => { <div class="error"> @message </div> }
25+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
2726
case Right(c) => { @c.usaga %}
2827
}
2928
</div>
@@ -37,7 +36,7 @@
3736
<div class="panel-body">
3837
<label><span class="strong"></span>Physical</label>
3938
@memory match {
40-
case Left(message) => { <div class="error"> @message </div> }
39+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
4140
case Right(m) => {
4241
<div class="row">
4342
<div class="col-sm-2">
@@ -87,7 +86,7 @@
8786
<div class="panel-body">
8887
<label><span class="strong">Swap</span></label>
8988
@swap match {
90-
case Left(message) => { <div class="error"> @message </div> }
89+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
9190
case Right(s) => {
9291
<div class="row">
9392
<div class="col-sm-2">

‎src/main/twirl/gitbucket/monitoring/information/system.scala.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@import context._
88
@import gitbucket.monitoring.models.OperatingSystem
99
@gitbucket.core.html.main("Monitoring") {
10-
<link href="@context.path/plugin-assets/monitoring/style.css" rel="stylesheet">
1110
@gitbucket.core.admin.html.menu("monitoring") {
1211
@gitbucket.monitoring.html.navigation(context)
1312
@if(onDocker) {
@@ -41,15 +40,15 @@ <h6><span class="label label-primary">On Docker</span></h6>
4140
<div class="row">
4241
<label class="col-md-2">StartTime</label>
4342
<span class="col-md-10">@upTime match {
44-
case Left(message) => { <div class="error"> @message </div> }
43+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
4544
case Right(u) => { @u.startTime }
4645
}
4746
</span>
4847
</div>
4948
<div class="row">
5049
<label class="col-md-2">UpTime</label>
5150
<span class="col-md-10">@upTime match {
52-
case Left(message) => { <div class="error"> @message </div> }
51+
case Left(message) => { @gitbucket.monitoring.helper.html.coloring(message) }
5352
case Right(u) => { @u.uptime }
5453
}
5554
</span>

0 commit comments

Comments
 (0)