status-im/ethereumj-personal
2
0
Fork 0
mirror of https://github.com/status-im/ethereumj-personal.git synced 2025-02-13 12:16:23 +00:00
Code Issues Projects Releases Wiki Activity

Refactor logging and remove initial forced ping

Browse Source
This commit is contained in:
nicksavers 2014-09-29 16:06:01 +02:00
parent 8cb7f3e594
commit 7327224939
7 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java
View File

@ -52,7 +52,6 @@ public class WorldManager {
// Initialize PeerData // Initialize PeerData
Set<Peer> peerDataList = parsePeerDiscoveryIpList(CONFIG.peerDiscoveryIPList()); Set<Peer> peerDataList = parsePeerDiscoveryIpList(CONFIG.peerDiscoveryIPList());
// peers.addAll(peerDataList);
peerDiscovery = new PeerDiscovery(peerDataList); peerDiscovery = new PeerDiscovery(peerDataList);
} }

22
ethereumj-core/src/main/java/org/ethereum/net/MessageQueue.java
View File

@ -32,7 +32,7 @@ public class MessageQueue {
private Queue<MessageRoundtrip> messageQueue = new ConcurrentLinkedQueue<>(); private Queue<MessageRoundtrip> messageQueue = new ConcurrentLinkedQueue<>();
private ChannelHandlerContext ctx = null; private ChannelHandlerContext ctx = null;
private Timer timer = new Timer(); private final Timer timer = new Timer();
public MessageQueue(ChannelHandlerContext ctx) { public MessageQueue(ChannelHandlerContext ctx) {
this.ctx = ctx; this.ctx = ctx;
@ -54,13 +54,11 @@ public class MessageQueue {
public void receivedMessage(Message msg) { public void receivedMessage(Message msg) {
if (logger.isDebugEnabled())
logger.debug("Recv: [{}] - [{}]",
msg.getCommand().name(),
Hex.toHexString(msg.getEncoded()));
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
logger.info("Recv: {}", msg.toString()); logger.info("From: \t{} \tRecv: \t{}", ctx.channel()
.remoteAddress().toString(), msg.toString());
if (logger.isDebugEnabled())
logger.debug("Encoded: [{}]", Hex.toHexString(msg.getEncoded()));
if (null != messageQueue.peek()) { if (null != messageQueue.peek()) {
@ -110,13 +108,11 @@ public class MessageQueue {
private void sendToWire(Message msg) { private void sendToWire(Message msg) {
if (logger.isDebugEnabled())
logger.debug("Send: [{}] - [{}]",
msg.getCommand().name(),
Hex.toHexString(msg.getEncoded()));
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
logger.info("Send: {}", msg.toString()); logger.info("To: \t{} \tSend: \t{}", ctx.channel()
.remoteAddress().toString(), msg.toString());
if (logger.isDebugEnabled())
logger.debug("Encdoded: [{}]", Hex.toHexString(msg.getEncoded()));
int packetLength = StaticMessages.SYNC_TOKEN.length + msg.getEncoded().length; int packetLength = StaticMessages.SYNC_TOKEN.length + msg.getEncoded().length;
ByteBuf buffer = ctx.alloc().buffer(packetLength); ByteBuf buffer = ctx.alloc().buffer(packetLength);

4
ethereumj-core/src/main/java/org/ethereum/net/client/Peer.java
View File

@ -103,8 +103,8 @@ public class Peer {
@Override @Override
public String toString() { public String toString() {
return "[ip=" + getInetAddress().getHostAddress() + return "[ip=" + getInetAddress().getHostAddress() +
", port=" + getPort() + " port=" + getPort() +
", peerId=" + (getPeerId() == null ? "" : Hex.toHexString(getPeerId())) " peerId=" + (getPeerId() == null ? "" : Hex.toHexString(getPeerId()))
+ "]"; + "]";
} }

3
ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerDiscovery.java
View File

@ -50,7 +50,7 @@ public class PeerDiscovery {
monitorThread.start(); monitorThread.start();
for (Peer peerData : this.peers) { for (Peer peerData : this.peers) {
executorPool.execute(new WorkerThread(peerData, executorPool)); this.addNewPeerData(peerData);
} }
started.set(true); started.set(true);
@ -70,6 +70,5 @@ public class PeerDiscovery {
public boolean isStarted() { public boolean isStarted() {
return started.get(); return started.get();
} }
} }

1
ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerProtocolHandler.java
View File

@ -71,7 +71,6 @@ public class PeerProtocolHandler extends ChannelInboundHandlerAdapter {
msgQueue = new MessageQueue(ctx); msgQueue = new MessageQueue(ctx);
msgQueue.sendMessage(StaticMessages.HELLO_MESSAGE); msgQueue.sendMessage(StaticMessages.HELLO_MESSAGE);
sendPing();
// sample for pinging in background // sample for pinging in background
timer.scheduleAtFixedRate(new TimerTask() { timer.scheduleAtFixedRate(new TimerTask() {

3
ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/WorkerThread.java
View File

@ -41,15 +41,14 @@ public class WorkerThread implements Runnable {
peerData.setOnline(true); peerData.setOnline(true);
peerData.setHandshake(peerTaster.getHandshake()); peerData.setHandshake(peerTaster.getHandshake());
logger.info("Peer: " + peerData.toString() + " isOnline: true");
} }
catch (Throwable e) { catch (Throwable e) {
if (peerData.isOnline() == true) if (peerData.isOnline() == true)
logger.info("Peer: [{}] went offline, due to: [{}]", logger.info("Peer: [{}] went offline, due to: [{}]",
peerData.getInetAddress().getHostAddress(), e); peerData.getInetAddress().getHostAddress(), e);
logger.info("Peer: " + peerData.toString() + " isOnline: false");
peerData.setOnline(false); peerData.setOnline(false);
} finally { } finally {
logger.info("Peer: " + peerData.toString() + " isOnline: " + peerData.isOnline());
peerData.setLastCheckTime(System.currentTimeMillis()); peerData.setLastCheckTime(System.currentTimeMillis());
} }
} }