diff --git a/build.gradle b/build.gradle index 910b74b38..e15b69f24 100644 --- a/build.gradle +++ b/build.gradle @@ -45,10 +45,6 @@ repositories { } dependencies { - implementation 'org.slf4j:slf4j-api:1.7.32' - compile 'org.apache.logging.log4j:log4j-slf4j-impl' - compile 'org.apache.logging.log4j:log4j-api' - compile 'org.apache.logging.log4j:log4j-core' compile 'com.lmax:disruptor:3.3.4' // This dependency is used by the application. diff --git a/src/org/minima/system/Main.java b/src/org/minima/system/Main.java index d1b6ee643..c0144286e 100644 --- a/src/org/minima/system/Main.java +++ b/src/org/minima/system/Main.java @@ -12,6 +12,7 @@ import org.minima.system.brains.SendManager; import org.minima.system.input.InputHandler; import org.minima.system.network.NetworkHandler; +import org.minima.system.network.p2p.P2PMessageProcessor; import org.minima.system.txpow.TxPoWMiner; import org.minima.utils.MinimaLogger; import org.minima.utils.SQLHandler; @@ -249,6 +250,8 @@ protected void processMessage(Message zMessage) throws Exception { }else if ( zMessage.isMessageType(SYSTEM_FULLSHUTDOWN) ) { // todo stop p2pmanager + mNetwork.getP2PMessageProcessor().PostMessage(P2PMessageProcessor.P2P_SHUTDOWN); + //Savew ther UserPrefs mUserPrefs.saveDB(mBackup.getUserPrefs()); diff --git a/src/org/minima/system/network/NetworkHandler.java b/src/org/minima/system/network/NetworkHandler.java index b202fdda1..0c315c89f 100644 --- a/src/org/minima/system/network/NetworkHandler.java +++ b/src/org/minima/system/network/NetworkHandler.java @@ -8,7 +8,6 @@ import java.util.Enumeration; import java.util.Random; -import lombok.extern.slf4j.Slf4j; import org.minima.Start; import org.minima.system.Main; import org.minima.system.brains.ConsensusHandler; @@ -30,7 +29,6 @@ import org.minima.utils.messages.MessageProcessor; import org.minima.utils.messages.TimerMessage; -@Slf4j public class NetworkHandler extends MessageProcessor { public static final String NETWORK_STARTUP = "NETWORK_START"; @@ -142,6 +140,8 @@ public NetworkHandler(String zHost, int zMainPort, boolean fullNode) { mLocalHost = zHost; } + mLogON = true; + //Starts local mIsRemoteOn = false; @@ -443,7 +443,7 @@ protected void processMessage(Message zMessage) throws Exception { MinimaClient client = (MinimaClient)zMessage.getObject("client"); boolean isIncoming = zMessage.getBoolean("isIncoming"); - log.warn("[!!] NETWORK_NEWCLIENT " + client.getAddress()); + MinimaLogger.log("[!!] NETWORK_NEWCLIENT " + client.getAddress()); //Add it mClients.add(client); // if (isIncoming) { @@ -496,7 +496,7 @@ protected void processMessage(Message zMessage) throws Exception { //Shut him down.. client.PostMessage(new Message(MinimaClient.NETCLIENT_SHUTDOWN)); - log.warn("[!!] NETCLIENT_SHUTDOWN " + client); + MinimaLogger.log("[!!] NETCLIENT_SHUTDOWN " + client); }else if(zMessage.isMessageType(NETWORK_TRACE)) { boolean traceon = zMessage.getBoolean("trace"); diff --git a/src/org/minima/system/network/base/MinimaClient.java b/src/org/minima/system/network/base/MinimaClient.java index e200fb666..4f661c0c0 100644 --- a/src/org/minima/system/network/base/MinimaClient.java +++ b/src/org/minima/system/network/base/MinimaClient.java @@ -146,6 +146,8 @@ public MinimaClient(InetSocketAddress address, NetworkHandler zNetwork) { //Outgoing connection mIncoming = false; + mLogON = true; + //Start the connection PostMessage(NETCLIENT_INITCONNECT); } @@ -173,6 +175,8 @@ public MinimaClient(Socket zSock, NetworkHandler zNetwork) { //Incoming connection mIncoming = true; + mLogON = true; + //Start the system.. PostMessage(NETCLIENT_STARTUP); } diff --git a/src/org/minima/system/network/base/MinimaReader.java b/src/org/minima/system/network/base/MinimaReader.java index 0b9313b51..72cbc8f9d 100644 --- a/src/org/minima/system/network/base/MinimaReader.java +++ b/src/org/minima/system/network/base/MinimaReader.java @@ -4,6 +4,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; +import java.io.IOException; +import java.net.SocketException; import java.util.ArrayList; import org.minima.objects.TxPoW; @@ -19,7 +21,13 @@ import org.minima.system.brains.ConsensusNet; import org.minima.system.network.NetworkHandler; import org.minima.system.network.p2p.P2PMessageProcessor; -import org.minima.system.network.p2p.messages.*; +import org.minima.system.network.p2p.messages.P2PMsgDoSwap; +import org.minima.system.network.p2p.messages.P2PMsgGreeting; +import org.minima.system.network.p2p.messages.P2PMsgNode; +import org.minima.system.network.p2p.messages.P2PMsgNodeNotAccepting; +import org.minima.system.network.p2p.messages.P2PMsgRendezvous; +import org.minima.system.network.p2p.messages.P2PMsgSwapLink; +import org.minima.system.network.p2p.messages.P2PMsgWalkLinks; import org.minima.system.txpow.TxPoWChecker; import org.minima.utils.Crypto; import org.minima.utils.MiniFormat; @@ -125,8 +133,8 @@ public void run() { //The Consensus ConsensusHandler consensus = Main.getMainHandler().getConsensusHandler(); - while (!mNetClient.getSocket().isClosed()) { - try { + while (true) { +// try { if (mInput.available() > 0) { //What message type msgtype = MiniByte.ReadFromStream(mInput); @@ -346,17 +354,11 @@ public void run() { Message msg = new Message(P2PMessageProcessor.P2P_NODE_NOT_ACCEPTING) .addObject("data", data); mNetClient.getNetworkHandler().getP2PMessageProcessor().PostMessage(msg); + + }else { + //Unknown Message.. + MinimaLogger.log("UNKNOWN MESSAGE MINIMAREADER.. "+msgtype); } -// else { -// throw new Exception("Invalid message on network : " + rec); -// } - - //Check there is nothing left.. -// int left = inputstream.available(); -// if (inputstream.available() > 0) { -// //Something gone wrong.. -// throw new ProtocolException("Data left in inputstream when reading.. " + left); -// } //Clean up.. inputstream.close(); @@ -365,25 +367,32 @@ public void run() { //Post it.. consensus.PostMessage(rec); } - } catch (ProtocolException exc) { - MinimaLogger.log("PROTOCOL ERROR.. " + exc); - MinimaLogger.log(exc); - } catch (OutOfMemoryError exc) { - MinimaLogger.log("MEMORY ERROR.. " + exc); - exc.printStackTrace(); - //DRASTIC ACTION.. Use ONLY if bash script in place to restart on Exit - //System.exit(99); - } catch (Exception exc) { - //General Exception - MinimaLogger.log("NETCLIENTREADER ERROR.. "); - MinimaLogger.log(exc); - } } - }catch (Exception exc) { - //General Exception - MinimaLogger.log("NETCLIENTREADER ERROR Client Disconnected.. "); - MinimaLogger.log(exc); - } + + }catch(SocketException exc) { + //Network error.. reset and reconnect.. + MinimaLogger.log("SocketException.. "+exc); + }catch(IOException exc) { + //Network error.. reset and reconnect.. + MinimaLogger.log("IOEXC.. "+exc); +// exc.printStackTrace(); + + }catch(ProtocolException exc) { + MinimaLogger.log("PROTOCOL ERROR.. "+exc); + MinimaLogger.log(exc); + + }catch(OutOfMemoryError exc) { + MinimaLogger.log("MEMORY ERROR.. "+exc); + exc.printStackTrace(); + + //DRASTIC ACTION.. Use ONLY if bash script in place to restart on Exit + //System.exit(99); + + }catch(Exception exc) { + //General Exception + MinimaLogger.log("NETCLIENTREADER ERROR.. "); + MinimaLogger.log(exc); + } //Tell the network Handler mNetClient.getNetworkHandler().PostMessage(new Message(NetworkHandler.NETWORK_CLIENTERROR).addObject("client", mNetClient)); diff --git a/src/org/minima/system/network/p2p/P2PMessageProcessor.java b/src/org/minima/system/network/p2p/P2PMessageProcessor.java index b73e8edfb..ebb9e6713 100644 --- a/src/org/minima/system/network/p2p/P2PMessageProcessor.java +++ b/src/org/minima/system/network/p2p/P2PMessageProcessor.java @@ -1,7 +1,6 @@ package org.minima.system.network.p2p; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.objects.greet.Greeting; import org.minima.system.Main; @@ -11,6 +10,7 @@ import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.functions.*; import org.minima.system.network.p2p.messages.*; +import org.minima.utils.MinimaLogger; import org.minima.utils.json.JSONArray; import org.minima.utils.json.JSONObject; import org.minima.utils.messages.Message; @@ -34,7 +34,6 @@ import static org.minima.system.network.NetworkHandler.NETWORK_DISCONNECT; @Getter -@Slf4j(topic = "P2P") public class P2PMessageProcessor extends MessageProcessor { /** @@ -81,7 +80,7 @@ public P2PMessageProcessor() { try { this.hostIP = InetAddress.getByName("localhost"); } catch (UnknownHostException e) { - log.error("Could not identify the local ip address: " + hostIP); + MinimaLogger.log("Could not identify the local ip address: " + hostIP); } state = new P2PState(null); state.setAddress(new InetSocketAddress(getHostIP(), getMinimaPort())); @@ -95,7 +94,7 @@ public P2PMessageProcessor(String hostIP, int minimaPort) { try { this.hostIP = InetAddress.getByName(hostIP); } catch (UnknownHostException e) { - log.error("Could not identify the local ip address: " + hostIP); + MinimaLogger.log("Could not identify the local ip address: " + hostIP); } this.minimaPort = minimaPort; @@ -146,7 +145,7 @@ protected List getCurrentIncomingMinimaClientsOnMinimaPort() { @Override protected void processMessage(Message zMessage) throws Exception { if (!zMessage.isMessageType(P2P_WALK_LINKS)) { - log.debug("[+] P2PMessageProcessor processing: " + zMessage.getMessageType()); + MinimaLogger.log("[+] P2PMessageProcessor processing: " + zMessage.getMessageType()); } try { switch (zMessage.getMessageType()) { @@ -214,7 +213,7 @@ protected void processMessage(Message zMessage) throws Exception { for (StackTraceElement traceElement : trace) builder.append("\tat ").append(traceElement).append("\n"); - log.error("[!] Exception in P2P Message Processor: " + e + "\n" + builder); + MinimaLogger.log("[!] Exception in P2P Message Processor: " + e + "\n" + builder); } } @@ -225,7 +224,7 @@ private void processSendMessage(Message zMessage) { } private void processShutdownMsg(Message zMessage) { - log.debug("[+] P2PMessageProcessor processing P2P_SHUTDOWN message"); + MinimaLogger.log("[+] P2PMessageProcessor processing P2P_SHUTDOWN message"); // Make sure the node list is saved StartupFuncs.SaveNodeList(this.state); //And stop this Message Processor stack @@ -262,10 +261,10 @@ private void processConnectMsg(Message zMessage) { Message msg = new Message(NETWORK_CONNECT); msg.addObject("address", address); - log.debug("[+] P2P_CONNECT to: " + address + " reason: " + reason); + MinimaLogger.log("[+] P2P_CONNECT to: " + address + " reason: " + reason); Main.getMainHandler().getNetworkHandler().PostMessage(msg); } else { - log.debug("[!] Attempting to connect to self"); + MinimaLogger.log("[!] Attempting to connect to self"); state.removeRandomNodeSet(address); } } @@ -274,7 +273,7 @@ private void processConnectMsg(Message zMessage) { private void processOnDisconnectedMsg(Message zMessage) { MinimaClient client = (MinimaClient) zMessage.getObject("client"); if (!client.isTemp()) { - log.debug("[!] P2P_ON_DISCONNECT Disconnected from isInLink? " + client.isIncoming() + " IP: " + client.getMinimaAddress()); + MinimaLogger.log("[!] P2P_ON_DISCONNECT Disconnected from isInLink? " + client.isIncoming() + " IP: " + client.getMinimaAddress()); // Message walkMsg; // if (client.isIncoming()) { // walkMsg = DisconnectionFuncs.onInLinkDisconnected(state, client, getCurrentMinimaClients()); @@ -286,7 +285,7 @@ private void processOnDisconnectedMsg(Message zMessage) { // } state.removeDisconnectingClient(client.getUID()); state.removeLink(client); - log.debug(this.state.genPrintableState()); + MinimaLogger.log(this.state.genPrintableState()); } } @@ -295,7 +294,7 @@ private void processOnDisconnectedMsg(Message zMessage) { private void processDisconnectMsg(Message zMessage) { MinimaClient client = (MinimaClient) zMessage.getObject("client"); String reason = zMessage.getString("reason"); - log.debug("[!] P2P_DISCONNECT Disconnecting from isInLink? " + client.isIncoming() + " IP: " + client.getMinimaAddress() + " UID: " + client.getUID() + " for: " + reason); + MinimaLogger.log("[!] P2P_DISCONNECT Disconnecting from isInLink? " + client.isIncoming() + " IP: " + client.getMinimaAddress() + " UID: " + client.getUID() + " for: " + reason); int attempt = zMessage.getInteger("attempt"); if (this.state.getOutLinks().contains(client.getMinimaAddress()) || this.state.getInLinks().contains(client.getMinimaAddress()) || @@ -354,7 +353,7 @@ public void processWalkLinksResponseMsg(Message zMessage) { P2PMsgWalkLinks p2pWalkLinks = (P2PMsgWalkLinks) zMessage.getObject("data"); Message sendMsg = null; if (state.getAddress().equals(p2pWalkLinks.getPathTaken().get(0))) { - log.debug("[+] P2P_WALK_LINKS_RESPONSE returned to origin node"); + MinimaLogger.log("[+] P2P_WALK_LINKS_RESPONSE returned to origin node"); if (p2pWalkLinks.isClientWalk()) { ArrayList msgs = WalkLinksFuncs.onReturnedClientWalkMsg(state, p2pWalkLinks); msgs.forEach(this::PostMessage); @@ -394,7 +393,7 @@ private void processLoopMsg(Message zMessage) { } ArrayList expiringMessages = this.state.dropExpiredMessages(); -// log.debug(state.genPrintableState()); +// MinimaLogger.log(state.genPrintableState()); PostTimerMessage(new TimerMessage(loopDelay, P2P_LOOP)); } @@ -411,7 +410,7 @@ private void processNodeNotAcceptingMsgCheck() { BroadcastFuncs.broadcastNodeNotAccepting(state, getCurrentMinimaClients()) .forEach(this::PostMessage); state.setClient(true); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); } } PostTimerMessage(new TimerMessage(GlobalParams.P2P_NODE_NOT_ACCEPTING_CHECK_DELAY, P2P_NODE_NOT_ACCEPTING_CHECK)); @@ -424,7 +423,7 @@ private void processNodeNotAcceptingMsg(Message zMessage) { P2PMsgNodeNotAccepting isClientMsg = (P2PMsgNodeNotAccepting) zMessage.getObject("data"); if (state.getInLinks().remove(isClientMsg.getBroadcaster())) { state.getClientLinks().add(isClientMsg.getBroadcaster()); - log.debug("[+] P2P_NODE_NOT_ACCEPTING_CHECK Moving " + isClientMsg.getBroadcaster() + " from inlinks to clientLinks"); + MinimaLogger.log("[+] P2P_NODE_NOT_ACCEPTING_CHECK Moving " + isClientMsg.getBroadcaster() + " from inlinks to clientLinks"); } } @@ -456,7 +455,7 @@ private void processNetworkMapMsg(Message zMessage) { if (state.getActiveMappingRequests().isEmpty()) { PostMessage(new Message(P2P_PRINT_NETWORK_MAP_RESPONSE)); } else { - log.debug("[+] P2P_MAP_NETWORK active mappings left: " + state.getActiveMappingRequests().keySet()); + MinimaLogger.log("[+] P2P_MAP_NETWORK active mappings left: " + state.getActiveMappingRequests().keySet()); } PostMessage(new Message(P2PMessageProcessor.P2P_DISCONNECT) @@ -516,7 +515,7 @@ private void processPrintNetworkMapResponseMsg(Message zMessage) { InputHandler.endResponse(printNetworkMapRPCReq, true, ""); } else { - log.warn("[-] Failed to make network map"); + MinimaLogger.log("[-] Failed to make network map"); } } diff --git a/src/org/minima/system/network/p2p/P2PState.java b/src/org/minima/system/network/p2p/P2PState.java index 29afc886c..db967bb0d 100644 --- a/src/org/minima/system/network/p2p/P2PState.java +++ b/src/org/minima/system/network/p2p/P2PState.java @@ -3,12 +3,12 @@ import com.google.common.collect.EvictingQueue; import lombok.Getter; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.objects.base.MiniData; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.messages.ExpiringMessage; import org.minima.system.network.p2p.messages.P2PMsgNode; +import org.minima.utils.MinimaLogger; import org.minima.utils.messages.Message; import java.io.File; @@ -19,7 +19,6 @@ @Getter @Setter -@Slf4j public class P2PState { /** @@ -97,7 +96,7 @@ public P2PState(File p2pDataFile) { public void addInLink(InetSocketAddress address) { this.inLinks.add(address); - log.debug(this.genPrintableState()); + MinimaLogger.log(this.genPrintableState()); } public boolean removeInLink(String uid) { @@ -106,7 +105,7 @@ public boolean removeInLink(String uid) { public void addOutLink(InetSocketAddress address) { this.outLinks.add(address); - log.debug(this.genPrintableState()); + MinimaLogger.log(this.genPrintableState()); } public boolean removeOutLink(InetSocketAddress address) { @@ -115,7 +114,7 @@ public boolean removeOutLink(InetSocketAddress address) { public void addClientLink(InetSocketAddress address) { this.clientLinks.add(address); - log.debug(this.genPrintableState()); + MinimaLogger.log(this.genPrintableState()); } public boolean removeClientLink(String uid) { @@ -136,7 +135,7 @@ public void removeLink(MinimaClient client) { this.inLinks.remove(client.getMinimaAddress()); } } - log.debug(this.genPrintableState()); + MinimaLogger.log(this.genPrintableState()); } public void addRandomNodeSet(InetSocketAddress address) { diff --git a/src/org/minima/system/network/p2p/functions/BroadcastFuncs.java b/src/org/minima/system/network/p2p/functions/BroadcastFuncs.java index 55492fd5f..373de1484 100644 --- a/src/org/minima/system/network/p2p/functions/BroadcastFuncs.java +++ b/src/org/minima/system/network/p2p/functions/BroadcastFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.P2PState; import org.minima.system.network.p2p.messages.P2PMsgNodeNotAccepting; @@ -14,7 +13,6 @@ import static org.minima.system.network.p2p.P2PMessageProcessor.P2P_SEND_MESSAGE; import static org.minima.system.network.p2p.functions.UtilFuncs.getClientForInetAddress; -@Slf4j public class BroadcastFuncs { public static List broadcastNodeNotAccepting(P2PState state, ArrayList clients) { diff --git a/src/org/minima/system/network/p2p/functions/DisconnectionFuncs.java b/src/org/minima/system/network/p2p/functions/DisconnectionFuncs.java index c6915b51c..3e5404977 100644 --- a/src/org/minima/system/network/p2p/functions/DisconnectionFuncs.java +++ b/src/org/minima/system/network/p2p/functions/DisconnectionFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.P2PState; @@ -10,7 +9,6 @@ import java.net.InetSocketAddress; import java.util.ArrayList; -@Slf4j public class DisconnectionFuncs { public static Message onInLinkDisconnected(P2PState state, MinimaClient client, ArrayList minimaClients) { diff --git a/src/org/minima/system/network/p2p/functions/GreetingFuncs.java b/src/org/minima/system/network/p2p/functions/GreetingFuncs.java index dc6ce1fc8..9577e90d7 100644 --- a/src/org/minima/system/network/p2p/functions/GreetingFuncs.java +++ b/src/org/minima/system/network/p2p/functions/GreetingFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.objects.base.MiniData; import org.minima.objects.greet.Greeting; @@ -9,6 +8,7 @@ import org.minima.system.network.p2p.P2PMessageProcessor; import org.minima.system.network.p2p.P2PState; import org.minima.system.network.p2p.messages.*; +import org.minima.utils.MinimaLogger; import org.minima.utils.messages.Message; import java.net.InetSocketAddress; @@ -16,7 +16,6 @@ import java.util.stream.Collectors; -@Slf4j public class GreetingFuncs { public static ArrayList onGreetedMsg(P2PState state, P2PMsgGreeting greeting, MinimaClient client, ArrayList allClients) { @@ -32,7 +31,7 @@ public static ArrayList onGreetedMsg(P2PState state, P2PMsgGreeting gre if (!client.isIncoming()){ reasonString.append(" for outbound connection"); } - log.debug(reasonString.toString()); + MinimaLogger.log(reasonString.toString()); // InLinks @@ -40,7 +39,7 @@ public static ArrayList onGreetedMsg(P2PState state, P2PMsgGreeting gre case NONE: if (client.isIncoming()) { state.getInLinks().add(client.getMinimaAddress()); - log.warn("[-] P2P Incoming connection with no reason"); + MinimaLogger.log("[-] P2P Incoming connection with no reason"); } break; case RENDEZVOUS: @@ -81,7 +80,7 @@ public static ArrayList onGreetedMsg(P2PState state, P2PMsgGreeting gre state.getRecentJoiners().add(address); } - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); return retMsgs; } @@ -121,7 +120,7 @@ public static ArrayList onEntryNodeGreeting(P2PState state, MinimaClien // } else { client.setIsTemp(false); state.addInLink(client.getMinimaAddress()); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); // } return retMsgs; @@ -134,7 +133,7 @@ public static ArrayList onDoSwapGreeting(P2PState state, MinimaClient c state.getExpectedAuthKeys().remove(authKey.toString()); state.addInLink(client.getMinimaAddress()); client.setIsTemp(false); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); } else { retMsgs.add(new Message(P2PMessageProcessor.P2P_DISCONNECT) @@ -154,7 +153,7 @@ public static ArrayList onAddOutLinkGreeting(P2PState state, MinimaClie client.setIsTemp(false); state.getExpectedAuthKeys().remove(authKey.toString()); state.addInLink(client.getMinimaAddress()); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); if (state.getInLinks().size() >= GlobalParams.P2P_NUM_LINKS) { P2PMsgSwapLink swapLink = new P2PMsgSwapLink(); @@ -183,7 +182,7 @@ public static ArrayList onReplacingOutLinkGreeting(P2PState state, Mini client.setIsTemp(false); state.getExpectedAuthKeys().remove(authKey.toString()); state.addInLink(client.getMinimaAddress()); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); } else { retMsgs.add(new Message(P2PMessageProcessor.P2P_DISCONNECT) .addObject("client", client) @@ -207,7 +206,7 @@ public static ArrayList onClientGreeting(P2PState state, MinimaClient c } else { client.setIsTemp(false); state.addClientLink(client.getMinimaAddress()); - log.debug(state.genPrintableState()); + MinimaLogger.log(state.genPrintableState()); if (state.getClientLinks().size() > GlobalParams.P2P_NUM_CLIENT_LINKS) { // Replace Outlink P2PMsgWalkLinks walkLinks = new P2PMsgWalkLinks(true, false); diff --git a/src/org/minima/system/network/p2p/functions/JoiningFuncs.java b/src/org/minima/system/network/p2p/functions/JoiningFuncs.java index b905ca8c2..ffc616021 100644 --- a/src/org/minima/system/network/p2p/functions/JoiningFuncs.java +++ b/src/org/minima/system/network/p2p/functions/JoiningFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.ConnectionDetails; @@ -9,12 +8,12 @@ import org.minima.system.network.p2p.P2PState; import org.minima.system.network.p2p.messages.ExpiringMessage; import org.minima.system.network.p2p.messages.P2PMsgWalkLinks; +import org.minima.utils.MinimaLogger; import org.minima.utils.messages.Message; import java.net.InetSocketAddress; import java.util.ArrayList; -@Slf4j public class JoiningFuncs { public static ArrayList joinRendezvousNode(P2PState state, ArrayList clients) { @@ -24,7 +23,7 @@ public static ArrayList joinRendezvousNode(P2PState state, ArrayList joinEntryNode(P2PState state, ArrayList LoadNodeList(P2PState state, String[] }); state.getRecentJoiners().addAll(loadedNodeList); } catch (IOException ioe) { - log.error("Error whilst reading in p2pDataFile: ", ioe); + MinimaLogger.log("Error whilst reading in p2pDataFile: ", ioe); } } else { if (noExtraHosts) { diff --git a/src/org/minima/system/network/p2p/functions/SwapFuncs.java b/src/org/minima/system/network/p2p/functions/SwapFuncs.java index bb18baa8b..02dc59243 100644 --- a/src/org/minima/system/network/p2p/functions/SwapFuncs.java +++ b/src/org/minima/system/network/p2p/functions/SwapFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.ConnectionDetails; import org.minima.system.network.p2p.ConnectionReason; @@ -8,13 +7,13 @@ import org.minima.system.network.p2p.P2PState; import org.minima.system.network.p2p.messages.P2PMsgDoSwap; import org.minima.system.network.p2p.messages.P2PMsgSwapLink; +import org.minima.utils.MinimaLogger; import org.minima.utils.messages.Message; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.stream.Collectors; -@Slf4j public class SwapFuncs { public static Message onSwapClientsReq(P2PState state, P2PMsgSwapLink swapLink, ArrayList allClients){ @@ -24,7 +23,7 @@ public static Message onSwapClientsReq(P2PState state, P2PMsgSwapLink swapLink, .filter(MinimaClient::isClient) .collect(Collectors.toCollection(ArrayList::new)); - log.debug("[!] P2P_SWAP_LINK Num Clients post filter: " + clients.size() + " num disconnecting clients: " + state.getDisconnectingClients().size() + " num clients: " + allClients.size()); + MinimaLogger.log("[!] P2P_SWAP_LINK Num Clients post filter: " + clients.size() + " num disconnecting clients: " + state.getDisconnectingClients().size() + " num clients: " + allClients.size()); MinimaClient minimaClient = UtilFuncs.getClientForInetAddress(addressToDoSwap, clients, true); return SwapFuncs.generateDoSwapMessage(state, swapLink, minimaClient); } @@ -46,7 +45,7 @@ public static Message onSwapReq(P2PState state, P2PMsgSwapLink swapLink, ArrayLi ArrayList clients = allClients.stream() .filter(x -> !state.getDisconnectingClients() .contains(x.getUID())).collect(Collectors.toCollection(ArrayList::new)); - log.debug("[!] P2P_SWAP_LINK from: " + state.getAddress() + " Num Clients post filter: " + clients.size() + " num disconnecting clients: " + state.getDisconnectingClients().size() + " num clients: " + allClients.size()); + MinimaLogger.log("[!] P2P_SWAP_LINK from: " + state.getAddress() + " Num Clients post filter: " + clients.size() + " num disconnecting clients: " + state.getDisconnectingClients().size() + " num clients: " + allClients.size()); minimaClient = UtilFuncs.getClientForInetAddress(addressToDoSwap, clients, true); } return SwapFuncs.generateDoSwapMessage(state, swapLink, minimaClient); @@ -56,7 +55,7 @@ public static Message generateDoSwapMessage(P2PState state, P2PMsgSwapLink swapL Message retMsg = null; if (minimaClient != null) { - log.debug("[+] P2P_DO_SWAP CLIENT Sending do swap message to client"); + MinimaLogger.log("[+] P2P_DO_SWAP CLIENT Sending do swap message to client"); P2PMsgDoSwap msgDoSwap = new P2PMsgDoSwap(); msgDoSwap.setSecret(swapLink.getSecret()); @@ -70,7 +69,7 @@ public static Message generateDoSwapMessage(P2PState state, P2PMsgSwapLink swapL .addObject("message", message); } else { - log.debug("[-] P2P_DO_SWAP not sent swap - no clients available"); + MinimaLogger.log("[-] P2P_DO_SWAP not sent swap - no clients available"); } return retMsg; diff --git a/src/org/minima/system/network/p2p/functions/UtilFuncs.java b/src/org/minima/system/network/p2p/functions/UtilFuncs.java index 919a1528d..3c4d934f1 100644 --- a/src/org/minima/system/network/p2p/functions/UtilFuncs.java +++ b/src/org/minima/system/network/p2p/functions/UtilFuncs.java @@ -1,13 +1,12 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.system.network.base.MinimaClient; +import org.minima.utils.MinimaLogger; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.concurrent.ThreadLocalRandom; -@Slf4j public class UtilFuncs { public static MinimaClient getClientForInetAddress(InetSocketAddress address, ArrayList clients, boolean isIncoming) { @@ -26,14 +25,14 @@ public static MinimaClient getClientForInetAddress(InetSocketAddress address, Ar break; } } else { - log.debug("[-] Minima Address is null for client: " + client.getUID()); + MinimaLogger.log("[-] Minima Address is null for client: " + client.getUID()); } } else { - log.debug("[-] client is null"); + MinimaLogger.log("[-] client is null"); } } } else { - log.debug("[-] address is null"); + MinimaLogger.log("[-] address is null"); } return returnClient; } @@ -53,14 +52,14 @@ public static MinimaClient getClientForInetAddressEitherDirection(InetSocketAddr break; } } else { - log.debug("[-] Minima Address is null for client: " + client.getUID()); + MinimaLogger.log("[-] Minima Address is null for client: " + client.getUID()); } } else { - log.debug("[-] client is null"); + MinimaLogger.log("[-] client is null"); } } } else { - log.debug("[-] address is null"); + MinimaLogger.log("[-] address is null"); } return returnClient; } @@ -73,11 +72,11 @@ public static MinimaClient getMinimaClientForClient(InetSocketAddress address, A { returnClient = client; } else { - log.debug("[-] Minima Address is null for client: " + client.getUID()); + MinimaLogger.log("[-] Minima Address is null for client: " + client.getUID()); } } } else { - log.debug("[-] address is null"); + MinimaLogger.log("[-] address is null"); } return returnClient; } diff --git a/src/org/minima/system/network/p2p/functions/WalkLinksFuncs.java b/src/org/minima/system/network/p2p/functions/WalkLinksFuncs.java index f9ccca901..22722bdce 100644 --- a/src/org/minima/system/network/p2p/functions/WalkLinksFuncs.java +++ b/src/org/minima/system/network/p2p/functions/WalkLinksFuncs.java @@ -1,6 +1,5 @@ package org.minima.system.network.p2p.functions; -import lombok.extern.slf4j.Slf4j; import org.minima.GlobalParams; import org.minima.system.network.base.MinimaClient; import org.minima.system.network.p2p.ConnectionDetails; @@ -10,6 +9,7 @@ import org.minima.system.network.p2p.messages.ExpiringMessage; import org.minima.system.network.p2p.messages.P2PMsgSwapLink; import org.minima.system.network.p2p.messages.P2PMsgWalkLinks; +import org.minima.utils.MinimaLogger; import org.minima.utils.messages.Message; import java.net.InetSocketAddress; @@ -20,7 +20,6 @@ * CLASS TO HOLD NO STATE. FUNCTIONS NOT STATIC FOR EASE OF TESTING * CAUSE JAVA.... */ -@Slf4j public class WalkLinksFuncs { public static Message onOutLinkWalkMsg(P2PState state, P2PMsgWalkLinks p2pWalkLinks, ArrayList allClients) { @@ -81,7 +80,7 @@ public static Message createNextHopMsg(InetSocketAddress nextHop, P2PMsgWalkLink Message retMsg = null; MinimaClient minimaClient = UtilFuncs.getClientForInetAddressEitherDirection(nextHop, allClients); if (minimaClient != null) { - log.debug("[+] P2P_WALK_LINKS Sending message to: " + nextHop + " isReturning: " + p2pWalkLinks.isReturning()); + MinimaLogger.log("[+] P2P_WALK_LINKS Sending message to: " + nextHop + " isReturning: " + p2pWalkLinks.isReturning()); Message message = new Message(MinimaClient.NETCLIENT_P2P_WALK_LINKS) .addObject("data", p2pWalkLinks); @@ -90,7 +89,7 @@ public static Message createNextHopMsg(InetSocketAddress nextHop, P2PMsgWalkLink .addObject("client", minimaClient) .addObject("message", message); } else { - log.warn("[-] P2P_WALK_LINKS MinimaClient for " + nextHop + " does not exist"); + MinimaLogger.log("[-] P2P_WALK_LINKS MinimaClient for " + nextHop + " does not exist"); } return retMsg; } @@ -130,10 +129,10 @@ public static Message onReturnedWalkMsg(P2PState state, P2PMsgWalkLinks msg) { .addString("reason", reason + " triggered by a completed connection walk"); state.getConnectionDetailsMap().put(connectTargetAddress, new ConnectionDetails(reason, msg.getSecret())); } else { - log.debug("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting already have max numLinks"); + MinimaLogger.log("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting already have max numLinks"); } } else { - log.debug("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting as returned own address"); + MinimaLogger.log("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting as returned own address"); } return returnMessage; @@ -146,11 +145,11 @@ public static ArrayList onReturnedClientWalkMsg(P2PState state, P2PMsgW if (!state.getRecentJoiners().contains(connectTargetAddress)) { state.addRandomNodeSet(connectTargetAddress); } - log.debug("[!] P2P_WALK_LINKS_RESPONSE: CLIENT creating do swap messages"); + MinimaLogger.log("[!] P2P_WALK_LINKS_RESPONSE: CLIENT creating do swap messages"); returnMessage.addAll(GreetingFuncs.genClientLoadBalanceRequests(state, connectTargetAddress, msg.getAvailableClientSlots())); } else { - log.debug("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting as returned own address"); + MinimaLogger.log("[!] P2P_WALK_LINKS_RESPONSE: Not Connecting as returned own address"); } return returnMessage; @@ -161,12 +160,12 @@ public static Message genP2PWalkLinkMsg(P2PState state, MinimaClient minimaClien Message retMsg = null; if (minimaClient != null) { if (walkLinks.isJoiningWalk()) { - log.debug("[+] " + logType + " P2P_WALK Starting inLink walk add outLink neighbour"); + MinimaLogger.log("[+] " + logType + " P2P_WALK Starting inLink walk add outLink neighbour"); } else { if (walkLinks.isWalkInLinks()) { - log.debug("[+] " + logType + " P2P_WALK Starting inLink walk to replace lost outLink neighbour"); + MinimaLogger.log("[+] " + logType + " P2P_WALK Starting inLink walk to replace lost outLink neighbour"); } else { - log.debug("[+] " + logType + " P2P_WALK Starting outLink walk to replace lost inLink neighbour"); + MinimaLogger.log("[+] " + logType + " P2P_WALK Starting outLink walk to replace lost inLink neighbour"); } } retMsg = new Message(P2PMessageProcessor.P2P_SEND_MESSAGE) diff --git a/src/org/minima/system/network/p2p/messages/P2PMsgNode.java b/src/org/minima/system/network/p2p/messages/P2PMsgNode.java index c3a28d25d..7700c4c3b 100644 --- a/src/org/minima/system/network/p2p/messages/P2PMsgNode.java +++ b/src/org/minima/system/network/p2p/messages/P2PMsgNode.java @@ -2,7 +2,6 @@ import lombok.Getter; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import org.minima.system.network.p2p.P2PState; import org.minima.utils.Streamable; import org.minima.utils.json.JSONArray; @@ -16,7 +15,6 @@ @Getter @Setter -@Slf4j public class P2PMsgNode implements Streamable { InetSocketAddress nodeAddress; private ArrayList inLinks;