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

cleanups

Browse Source
This commit is contained in:
zzz
2011-08-19 15:30:31 +00:00
parent de094433da
commit 10f3337906
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/routerconsole/java/src/net/i2p/router/web/ShitlistRenderer.java
View File

@ -24,15 +24,15 @@ import net.i2p.router.Shitlist;
* Moved from Shitlist.java * Moved from Shitlist.java
*/ */
public class ShitlistRenderer { public class ShitlistRenderer {
private RouterContext _context; private final RouterContext _context;
public ShitlistRenderer(RouterContext context) { public ShitlistRenderer(RouterContext context) {
_context = context; _context = context;
} }
private static class HashComparator implements Comparator { private static class HashComparator implements Comparator<Hash> {
public int compare(Object l, Object r) { public int compare(Hash l, Hash r) {
return ((Hash)l).toBase64().compareTo(((Hash)r).toBase64()); return l.toBase64().compareTo(r.toBase64());
} }
} }
@ -54,9 +54,11 @@ public class ShitlistRenderer {
for (Map.Entry<Hash, Shitlist.Entry> e : entries.entrySet()) { for (Map.Entry<Hash, Shitlist.Entry> e : entries.entrySet()) {
Hash key = e.getKey(); Hash key = e.getKey();
Shitlist.Entry entry = e.getValue(); Shitlist.Entry entry = e.getValue();
long expires = entry.expireOn-_context.clock().now();
if (expires <= 0)
continue;
buf.append("<li>").append(_context.commSystem().renderPeerHTML(key)); buf.append("<li>").append(_context.commSystem().renderPeerHTML(key));
buf.append(' '); buf.append(' ');
long expires = entry.expireOn-_context.clock().now();
String expireString = DataHelper.formatDuration2(expires); String expireString = DataHelper.formatDuration2(expires);
if (expires < 5l*24*60*60*1000) if (expires < 5l*24*60*60*1000)
buf.append(_("Temporary ban expiring in {0}", expireString)); buf.append(_("Temporary ban expiring in {0}", expireString));

11
router/java/src/net/i2p/router/Shitlist.java
View File

@ -11,7 +11,7 @@ package net.i2p.router;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -55,7 +55,7 @@ public class Shitlist {
public Shitlist(RouterContext context) { public Shitlist(RouterContext context) {
_context = context; _context = context;
_log = context.logManager().getLog(Shitlist.class); _log = context.logManager().getLog(Shitlist.class);
_entries = new ConcurrentHashMap(8); _entries = new ConcurrentHashMap(16);
_context.jobQueue().addJob(new Cleanup(_context)); _context.jobQueue().addJob(new Cleanup(_context));
} }
@ -96,9 +96,12 @@ public class Shitlist {
return _entries.size(); return _entries.size();
} }
/** for ShitlistRenderer in router console */ /**
* For ShitlistRenderer in router console.
* Note - may contain expired entries.
*/
public Map<Hash, Entry> getEntries() { public Map<Hash, Entry> getEntries() {
return new HashMap<Hash, Entry>(_entries); return Collections.unmodifiableMap(_entries);
} }
public boolean shitlistRouter(Hash peer) { public boolean shitlistRouter(Hash peer) {