marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make /jobs HTML consistent with other pages

Browse Source
This commit is contained in:
str4d
2016-04-18 04:55:57 +00:00
parent 4547d5887d
commit 423167fdd3
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
View File

@@ -47,13 +47,16 @@ public class JobQueueHelper extends HelperBase {
int numRunners = _context.jobQueue().getJobs(readyJobs, timedJobs, activeJobs, justFinishedJobs); int numRunners = _context.jobQueue().getJobs(readyJobs, timedJobs, activeJobs, justFinishedJobs);
StringBuilder buf = new StringBuilder(32*1024); StringBuilder buf = new StringBuilder(32*1024);
buf.append("<b><div class=\"joblog\"><h3>").append(_t("I2P Job Queue")).append("</h3><br><div class=\"wideload\">") buf.append("<div class=\"wideload\"><div class=\"joblog\">")
.append("<h3 id=\"jobrunners\">")
.append(_t("Job runners")).append(": ").append(numRunners) .append(_t("Job runners")).append(": ").append(numRunners)
.append("</b><br>\n"); .append("</h3>\n");
long now = _context.clock().now(); long now = _context.clock().now();
buf.append("<hr><b>").append(_t("Active jobs")).append(": ").append(activeJobs.size()).append("</b><ol>\n"); buf.append("<h3 id=\"activejobs\">")
.append(_t("Active jobs")).append(": ").append(activeJobs.size())
.append("</h3><ol>\n");
for (int i = 0; i < activeJobs.size(); i++) { for (int i = 0; i < activeJobs.size(); i++) {
Job j = activeJobs.get(i); Job j = activeJobs.get(i);
buf.append("<li>(").append(_t("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): "); buf.append("<li>(").append(_t("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): ");
@@ -61,7 +64,9 @@ public class JobQueueHelper extends HelperBase {
} }
buf.append("</ol>\n"); buf.append("</ol>\n");
buf.append("<hr><b>").append(_t("Just finished jobs")).append(": ").append(justFinishedJobs.size()).append("</b><ol>\n"); buf.append("<h3 id=\"finishedjobs\">")
.append(_t("Just finished jobs")).append(": ").append(justFinishedJobs.size())
.append("</h3><ol>\n");
for (int i = 0; i < justFinishedJobs.size(); i++) { for (int i = 0; i < justFinishedJobs.size(); i++) {
Job j = justFinishedJobs.get(i); Job j = justFinishedJobs.get(i);
buf.append("<li>(").append(_t("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): "); buf.append("<li>(").append(_t("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): ");
@@ -69,7 +74,9 @@ public class JobQueueHelper extends HelperBase {
} }
buf.append("</ol>\n"); buf.append("</ol>\n");
buf.append("<hr><b>").append(_t("Ready/waiting jobs")).append(": ").append(readyJobs.size()).append("</b><ol>\n"); buf.append("<h3 id=\"readyjobs\">")
.append(_t("Ready/waiting jobs")).append(": ").append(readyJobs.size())
.append("</h3><ol>\n");
ObjectCounter<String> counter = new ObjectCounter<String>(); ObjectCounter<String> counter = new ObjectCounter<String>();
for (int i = 0; i < readyJobs.size(); i++) { for (int i = 0; i < readyJobs.size(); i++) {
Job j = readyJobs.get(i); Job j = readyJobs.get(i);
@@ -86,7 +93,9 @@ public class JobQueueHelper extends HelperBase {
out.write(buf.toString()); out.write(buf.toString());
buf.setLength(0); buf.setLength(0);
buf.append("<hr><b>").append(_t("Scheduled jobs")).append(": ").append(timedJobs.size()).append("</b><ol>\n"); buf.append("<h3 id=\"scheduledjobs\">")
.append(_t("Scheduled jobs")).append(": ").append(timedJobs.size())
.append("</h3><ol>\n");
long prev = Long.MIN_VALUE; long prev = Long.MIN_VALUE;
counter.clear(); counter.clear();
for (int i = 0; i < timedJobs.size(); i++) { for (int i = 0; i < timedJobs.size(); i++) {
@@ -110,7 +119,9 @@ public class JobQueueHelper extends HelperBase {
out.write(buf.toString()); out.write(buf.toString());
buf.setLength(0); buf.setLength(0);
buf.append("<hr><b>").append(_t("Total Job Statistics")).append("</b>\n"); buf.append("<h3 id=\"totaljobstats\">")
.append(_t("Total Job Statistics"))
.append("</h3>\n");
getJobStats(buf); getJobStats(buf);
out.write(buf.toString()); out.write(buf.toString());
} }
@@ -121,7 +132,7 @@ public class JobQueueHelper extends HelperBase {
if (names.size() < 4) if (names.size() < 4)
return; return;
buf.append("<table id=\"schedjobs\" style=\"width: 30%; margin-left: 100px;\">\n" + buf.append("<table id=\"schedjobs\" style=\"width: 30%; margin-left: 100px;\">\n" +
"<tr><th>").append(_t("Job")).append("</th><th>").append(_t("Queued")).append("<th>"); "<tr><th>").append(_t("Job")).append("</th><th>").append(_t("Queued")).append("</th></tr>\n");
Collections.sort(names, new JobCountComparator(counter)); Collections.sort(names, new JobCountComparator(counter));
for (String name : names) { for (String name : names) {
buf.append("<tr><td>").append(name) buf.append("<tr><td>").append(name)

4
apps/routerconsole/jsp/jobs.jsp
View File

@@ -10,9 +10,9 @@
<%@include file="summaryajax.jsi" %> <%@include file="summaryajax.jsi" %>
</head><body onload="initAjax()"> </head><body onload="initAjax()">
<%@include file="summary.jsi" %><h1><%=intl._t("I2P Router Job Queue")%></h1> <%@include file="summary.jsi" %><h1><%=intl._t("I2P Router Job Queue")%></h1>
<div class="main" id="main"> <div class="main" id="jobs">
<jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
<jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<% jobQueueHelper.storeWriter(out); %> <% jobQueueHelper.storeWriter(out); %>
<jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" /> <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
<hr></div></body></html> </div></body></html>