* jobs.jsp: Add more queue diagnostics

apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java

@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.TreeMap;
 
 import net.i2p.data.DataHelper;
 import net.i2p.router.Job;
@@ -76,15 +75,17 @@ public class JobQueueHelper extends HelperBase {
         out.flush();
 
         buf.append("<hr><b>Scheduled jobs: ").append(timedJobs.size()).append("</b><ol>\n");
-        TreeMap<Long, Job> ordered = new TreeMap();
+        long prev = Long.MIN_VALUE;
-        for (int i = 0; i < timedJobs.size(); i++) {
+        for (Job j : timedJobs) {
-            Job j = timedJobs.get(i);
-            ordered.put(Long.valueOf(j.getTiming().getStartAfter()), j);
-        }
-        for (Job j : ordered.values()) {
             long time = j.getTiming().getStartAfter() - now;
             buf.append("<li>").append(j.getName()).append(" in ");
-            buf.append(DataHelper.formatDuration2(time)).append("</li>\n");
+            buf.append(DataHelper.formatDuration2(time));
+            if (time < 0)
+                buf.append(" <b>DELAYED</b>");
+            if (time < prev)
+                buf.append(" <b>** OUT OF ORDER **</b>");
+            prev = time;
+            buf.append("</li>\n");
         }
         buf.append("</ol></div>\n");
         

history.txt

@@ -1,3 +1,11 @@
+2012-05-23 zzz
+ * i2psnark:
+   - Fixes when complete except for skipped files
+     (ticket #447) status in UI, don't connect outbound,
+     disconnect seeds when done
+   - More classes pkg private
+ * jobs.jsp: Add more queue diagnostics
+
 2012-05-22 zzz
  * i2psnark:
    - Refactor tracker map
@@ -9,7 +17,7 @@
  * Console: Add full file path to thread dump message
  * i2psnark:
    - Create sparse files at torrent creation and delay
-     "ballooning" until first write (ticket #641)
+     "ballooning" until first write (ticket #641, #447)
    - Redo clear messages button
    - Concurrent message queue
  * Profiles: reduce same-country bonus

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";