diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index 02f18a19ae..6746d917cc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -54,14 +54,14 @@ public class JobQueueHelper extends HelperBase { buf.append("
Active jobs: ").append(activeJobs.size()).append("
    \n"); for (int i = 0; i < activeJobs.size(); i++) { Job j = activeJobs.get(i); - buf.append("
  1. [started ").append(DataHelper.formatDuration(now-j.getTiming().getStartAfter())).append(" ago]: "); + buf.append("
  2. [started ").append(DataHelper.formatDuration2(now-j.getTiming().getStartAfter())).append(" ago]: "); buf.append(j.toString()).append("
  3. \n"); } buf.append("
\n"); buf.append("
Just finished jobs: ").append(justFinishedJobs.size()).append("
    \n"); for (int i = 0; i < justFinishedJobs.size(); i++) { Job j = justFinishedJobs.get(i); - buf.append("
  1. [finished ").append(DataHelper.formatDuration(now-j.getTiming().getActualEnd())).append(" ago]: "); + buf.append("
  2. [finished ").append(DataHelper.formatDuration2(now-j.getTiming().getActualEnd())).append(" ago]: "); buf.append(j.toString()).append("
  3. \n"); } buf.append("
\n"); @@ -69,7 +69,7 @@ public class JobQueueHelper extends HelperBase { for (int i = 0; i < readyJobs.size(); i++) { Job j = readyJobs.get(i); buf.append("
  • [waiting "); - buf.append(DataHelper.formatDuration(now-j.getTiming().getStartAfter())); + buf.append(DataHelper.formatDuration2(now-j.getTiming().getStartAfter())); buf.append("]: "); buf.append(j.toString()).append("
  • \n"); } @@ -85,7 +85,7 @@ public class JobQueueHelper extends HelperBase { for (Job j : ordered.values()) { long time = j.getTiming().getStartAfter() - now; buf.append("
  • ").append(j.getName()).append(" in "); - buf.append(DataHelper.formatDuration(time)).append("
  • \n"); + buf.append(DataHelper.formatDuration2(time)).append("\n"); } buf.append("\n"); @@ -125,14 +125,14 @@ public class JobQueueHelper extends HelperBase { buf.append(""); buf.append("").append(stats.getName()).append(""); buf.append("").append(stats.getRuns()).append(""); - buf.append("").append(stats.getTotalTime()).append(""); - buf.append("").append(stats.getAvgTime()).append(""); - buf.append("").append(stats.getMaxTime()).append(""); - buf.append("").append(stats.getMinTime()).append(""); - buf.append("").append(stats.getTotalPendingTime()).append(""); - buf.append("").append(stats.getAvgPendingTime()).append(""); - buf.append("").append(stats.getMaxPendingTime()).append(""); - buf.append("").append(stats.getMinPendingTime()).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getTotalTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getAvgTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getMaxTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getMinTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getTotalPendingTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getAvgPendingTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getMaxPendingTime())).append(""); + buf.append("").append(DataHelper.formatDuration2(stats.getMinPendingTime())).append(""); buf.append("\n"); totRuns += stats.getRuns(); totExecTime += stats.getTotalTime(); @@ -157,14 +157,14 @@ public class JobQueueHelper extends HelperBase { buf.append(""); buf.append("").append("SUMMARY").append(""); buf.append("").append(totRuns).append(""); - buf.append("").append(totExecTime).append(""); - buf.append("").append(avgExecTime).append(""); - buf.append("").append(maxExecTime).append(""); - buf.append("").append(minExecTime).append(""); - buf.append("").append(totPendingTime).append(""); - buf.append("").append(avgPendingTime).append(""); - buf.append("").append(maxPendingTime).append(""); - buf.append("").append(minPendingTime).append(""); + buf.append("").append(DataHelper.formatDuration2(totExecTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(avgExecTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(maxExecTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(minExecTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(totPendingTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(avgPendingTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(maxPendingTime)).append(""); + buf.append("").append(DataHelper.formatDuration2(minPendingTime)).append(""); buf.append("\n"); }