Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-04-30 14:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

change to better ping task log output, some cleanup

Browse Source
This commit is contained in:
Jürg Schulthess 2025-01-12 10:33:48 +01:00
parent 1b4fffe0d2
commit ef171c4d03
3 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/qortal/network/RNSNetwork.java
View File

@ -445,20 +445,20 @@ public class RNSNetwork {
// .orElse(null); // .orElse(null);
//} //}
private Task maybeProducePeerPingTask(Long now) { private Task maybeProducePeerPingTask(Long now) {
var ilp = getImmutableLinkedPeers().stream() //var ilp = getImmutableLinkedPeers().stream()
.map(peer -> peer.getPingTask(now))
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
if (nonNull(ilp)) {
log.info("ilp - {}", ilp);
}
return ilp;
//return getImmutableLinkedPeers().stream()
// .map(peer -> peer.getPingTask(now)) // .map(peer -> peer.getPingTask(now))
// .filter(Objects::nonNull) // .filter(Objects::nonNull)
// .findFirst() // .findFirst()
// .orElse(null); // .orElse(null);
//if (nonNull(ilp)) {
// log.info("ilp - {}", ilp);
//}
//return ilp;
return getImmutableLinkedPeers().stream()
.map(peer -> peer.getPingTask(now))
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
} }
//private Task maybeProduceBroadcastTask(Long now) { //private Task maybeProduceBroadcastTask(Long now) {
@ -594,7 +594,7 @@ public class RNSNetwork {
activePeerCount = activePeerCount + 1; activePeerCount = activePeerCount + 1;
} }
} }
log.info("we have {} active peers", activePeerCount); log.info("we have {} active peers (linkedPeers)", activePeerCount);
maybeAnnounce(getBaseDestination()); maybeAnnounce(getBaseDestination());
} }

36
src/main/java/org/qortal/network/RNSPeer.java
View File

@ -167,7 +167,7 @@ public class RNSPeer {
public BufferedRWPair getOrInitPeerBuffer() { public BufferedRWPair getOrInitPeerBuffer() {
var channel = this.peerLink.getChannel(); var channel = this.peerLink.getChannel();
if (nonNull(this.peerBuffer)) { if (nonNull(this.peerBuffer)) {
log.info("peerBuffer exists: {}, link status: {}", this.peerBuffer, this.peerLink.getStatus()); log.trace("peerBuffer exists: {}, link status: {}", this.peerBuffer, this.peerLink.getStatus());
return this.peerBuffer; return this.peerBuffer;
//try { //try {
// this.peerBuffer.close(); // this.peerBuffer.close();
@ -298,12 +298,11 @@ public class RNSPeer {
// break; // break;
case PING: case PING:
//log.info("sending PING response"); onPingMessage(this, message);
//onPingMessage(this, message); //PongMessage pongMessage = new PongMessage();
PongMessage pongMessage = new PongMessage(); //pongMessage.setId(message.getId());
pongMessage.setId(message.getId()); //this.peerBuffer.write(pongMessage.toBytes());
this.peerBuffer.write(pongMessage.toBytes()); //this.peerBuffer.flush();
this.peerBuffer.flush();
break; break;
case PONG: case PONG:
@ -470,15 +469,19 @@ public class RNSPeer {
/** qortal networking specific (Tasks) */ /** qortal networking specific (Tasks) */
//private void onPingMessage(RNSPeer peer, Message message) { private void onPingMessage(RNSPeer peer, Message message) {
// PingMessage pingMessage = (PingMessage) message; PingMessage pingMessage = (PingMessage) message;
//
// // Generate 'pong' using same ID try {
// PingMessage pongMessage = new PingMessage(); PongMessage pongMessage = new PongMessage();
// pongMessage.setId(pingMessage.getId()); pongMessage.setId(message.getId()); // use the ping message id
// this.peerBuffer.write(pongMessage.toBytes());
// sendMessageWithTimeout(pongMessage, RESPONSE_TIMEOUT); this.peerBuffer.flush();
//} } catch (MessageException e) {
//log.error("{} from peer {}", e.getMessage(), this);
log.error("{} from peer {}", e, this);
}
}
/** /**
* Send message to peer and await response, using default RESPONSE_TIMEOUT. * Send message to peer and await response, using default RESPONSE_TIMEOUT.
@ -493,6 +496,7 @@ public class RNSPeer {
* @throws InterruptedException if interrupted while waiting * @throws InterruptedException if interrupted while waiting
*/ */
public void getResponse(Message message) throws InterruptedException { public void getResponse(Message message) throws InterruptedException {
log.info("RNSPingTask action - pinging peer {}", encodeHexString(getDestinationHash()));
getResponseWithTimeout(message, RESPONSE_TIMEOUT); getResponseWithTimeout(message, RESPONSE_TIMEOUT);
} }

11
src/main/java/org/qortal/network/task/RNSPingTask.java
View File

@ -47,16 +47,7 @@ public class RNSPingTask implements Task {
//} //}
peer.getResponse(pingMessage); peer.getResponse(pingMessage);
//Message message = peer.getResponse(pingMessage); //// task is not over here.
//
//if (message == null || message.getType() != MessageType.PING) {
// LOGGER.debug("[{}] Didn't receive reply from {} for PING ID {}",
// peer.getPeerConnectionId(), peer, pingMessage.getId());
// peer.disconnect("no ping received");
// return;
//}
//// tast is not over here.
//peer.setLastPing(NTP.getTime() - now); //peer.setLastPing(NTP.getTime() - now);
} }
} }