mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set threadname for input handler with onion address, shutdown if inputstream has no data

Browse Source
This commit is contained in:
Manfred Karrer 2016-07-29 17:15:33 +02:00
parent 86a1d8d04e
commit db4efef8d5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
network/src/main/java/io/bitsquare/p2p/network/Connection.java
View File

@ -681,6 +681,7 @@ public class Connection implements MessageListener {
private volatile boolean stopped; private volatile boolean stopped;
private long lastReadTimeStamp; private long lastReadTimeStamp;
private boolean threadNameSet;
public InputHandler(SharedModel sharedModel, ObjectInputStream objectInputStream, String portInfo, MessageListener messageListener) { public InputHandler(SharedModel sharedModel, ObjectInputStream objectInputStream, String portInfo, MessageListener messageListener) {
this.sharedModel = sharedModel; this.sharedModel = sharedModel;
@ -705,8 +706,19 @@ public class Connection implements MessageListener {
@Override @Override
public void run() { public void run() {
try { try {
Thread.currentThread().setName("InputHandler-" + portInfo); Thread.currentThread().setName("InputHandler");
while (!stopped && !Thread.currentThread().isInterrupted()) { while (!stopped && !Thread.currentThread().isInterrupted()) {
if (!threadNameSet && sharedModel.connection.getPeersNodeAddressOptional().isPresent()) {
Thread.currentThread().setName("InputHandler-" + sharedModel.connection.getPeersNodeAddressOptional().get().getFullAddress());
threadNameSet = true;
}
if (objectInputStream.available() < 0) {
log.warn("Shutdown because objectInputStream.available() < 0. objectInputStream.available()=" + objectInputStream.available());
sharedModel.shutDown(CloseConnectionReason.TERMINATED);
return;
}
Connection connection = sharedModel.connection; Connection connection = sharedModel.connection;
log.trace("InputHandler waiting for incoming messages.\n\tConnection=" + connection); log.trace("InputHandler waiting for incoming messages.\n\tConnection=" + connection);
try { try {
@ -737,7 +749,8 @@ public class Connection implements MessageListener {
} else if (rawInputObject instanceof Message) { } else if (rawInputObject instanceof Message) {
// We want to log all incoming messages (except Pong and RefreshTTLMessage) // We want to log all incoming messages (except Pong and RefreshTTLMessage)
// so we log before the data type checks // so we log before the data type checks
log.info("\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n" + log.info("size={}; object={}", size, Utilities.toTruncatedString(rawInputObject.toString(), 100));
log.debug("\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n" +
"New data arrived at inputHandler of connection {}.\n" + "New data arrived at inputHandler of connection {}.\n" +
"Received object (truncated)={} / size={}" "Received object (truncated)={} / size={}"
+ "\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", + "\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",