bitmessage/Jabit
bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor improvements for logging and debugging

Browse Source
This commit is contained in:
Christian Basler 2017-05-04 07:24:26 +02:00
parent e5c956c6e5
commit 2ae1e561d8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/ch/dissem/bitmessage/utils/TTL.java
View File

@ -38,7 +38,7 @@ public class TTL {
} }
private static long validate(long ttl) { private static long validate(long ttl) {
if (ttl < 0 || ttl > 28 * DAY) throw new IllegalArgumentException("TTL must be between 1 and 28 days"); if (ttl < 0 || ttl > 28 * DAY) throw new IllegalArgumentException("TTL must be between 0 seconds and 28 days");
return ttl; return ttl;
} }
} }

16
networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
View File

@ -254,7 +254,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
} }
} }
} catch (CancelledKeyException e) { } catch (CancelledKeyException e) {
LOG.error(e.getMessage(), e); LOG.debug(e.getMessage(), e);
} }
} else { } else {
// handle read/write // handle read/write
@ -287,11 +287,15 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
} }
// set interest ops // set interest ops
for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) { for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
if (e.getValue().isValid() try {
&& (e.getValue().interestOps() & OP_WRITE) == 0 if (e.getValue().isValid()
&& (e.getValue().interestOps() & OP_CONNECT) == 0 && (e.getValue().interestOps() & OP_WRITE) == 0
&& !e.getKey().getSendingQueue().isEmpty()) { && (e.getValue().interestOps() & OP_CONNECT) == 0
e.getValue().interestOps(OP_READ | OP_WRITE); && !e.getKey().getSendingQueue().isEmpty()) {
e.getValue().interestOps(OP_READ | OP_WRITE);
}
} catch (CancelledKeyException x) {
e.getKey().disconnect();
} }
} }
// start new connections // start new connections