From 05ac2594b64a51cef8c1d9c6eb00f52dc22f3eb6 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 9 Jul 2010 17:40:59 +0000 Subject: [PATCH] more shouldLog() --- .../src/org/klomp/snark/I2PSnarkUtil.java | 9 ++++-- .../java/src/org/klomp/snark/MetaInfo.java | 9 ++++-- .../java/src/org/klomp/snark/Peer.java | 31 ++++++++++++------- .../src/org/klomp/snark/PeerAcceptor.java | 8 +++-- .../src/org/klomp/snark/SnarkManager.java | 11 ++++--- 5 files changed, 44 insertions(+), 24 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index bbdc09ab42..6f17a810ab 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -228,7 +228,8 @@ public class I2PSnarkUtil { public File get(String url, boolean rewrite) { return get(url, rewrite, 0); } public File get(String url, int retries) { return get(url, true, retries); } public File get(String url, boolean rewrite, int retries) { - _log.debug("Fetching [" + url + "] proxy=" + _proxyHost + ":" + _proxyPort + ": " + _shouldProxy); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Fetching [" + url + "] proxy=" + _proxyHost + ":" + _proxyPort + ": " + _shouldProxy); File out = null; try { // we could use the system tmp dir but deleteOnExit() doesn't seem to work on all platforms... @@ -252,10 +253,12 @@ public class I2PSnarkUtil { } EepGet get = new I2PSocketEepGet(_context, _manager, retries, out.getAbsolutePath(), fetchURL); if (get.fetch()) { - _log.debug("Fetch successful [" + url + "]: size=" + out.length()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Fetch successful [" + url + "]: size=" + out.length()); return out; } else { - _log.warn("Fetch failed [" + url + "]"); + if (_log.shouldLog(Log.WARN)) + _log.warn("Fetch failed [" + url + "]"); out.delete(); return null; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index f8c8feaede..140d3cb468 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -109,7 +109,8 @@ public class MetaInfo */ public MetaInfo(Map m) throws InvalidBEncodingException { - _log.debug("Creating a metaInfo: " + m, new Exception("source")); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Creating a metaInfo: " + m, new Exception("source")); BEValue val = (BEValue)m.get("announce"); if (val == null) throw new InvalidBEncodingException("Missing announce string"); @@ -446,14 +447,16 @@ public class MetaInfo else buf.append(val.toString()); } - _log.debug(buf.toString()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug(buf.toString()); byte[] infoBytes = BEncoder.bencode(info); //_log.debug("info bencoded: [" + Base64.encode(infoBytes, true) + "]"); try { MessageDigest digest = MessageDigest.getInstance("SHA"); byte hash[] = digest.digest(infoBytes); - _log.debug("info hash: [" + net.i2p.data.Base64.encode(hash) + "]"); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("info hash: [" + net.i2p.data.Base64.encode(hash) + "]"); return hash; } catch(NoSuchAlgorithmException nsa) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java index 4e965a0721..da1003aaba 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java @@ -92,7 +92,8 @@ public class Peer implements Comparable byte[] id = handshake(in, out); this.peerID = new PeerID(id, sock.getPeerDestination()); _id = ++__id; - _log.debug("Creating a new peer with " + peerID.getAddress().calculateHash().toBase64(), new Exception("creating " + _id)); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Creating a new peer with " + peerID.getAddress().calculateHash().toBase64(), new Exception("creating " + _id)); } /** @@ -182,14 +183,16 @@ public class Peer implements Comparable if (state != null) throw new IllegalStateException("Peer already started"); - _log.debug("Running connection to " + peerID.getAddress().calculateHash().toBase64(), new Exception("connecting")); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Running connection to " + peerID.getAddress().calculateHash().toBase64(), new Exception("connecting")); try { // Do we need to handshake? if (din == null) { sock = util.connect(peerID); - _log.debug("Connected to " + peerID + ": " + sock); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Connected to " + peerID + ": " + sock); if ((sock == null) || (sock.isClosed())) { throw new IOException("Unable to reach " + peerID); } @@ -208,17 +211,20 @@ public class Peer implements Comparable // = new BufferedOutputStream(sock.getOutputStream()); byte [] id = handshake(in, out); //handshake(bis, bos); byte [] expected_id = peerID.getID(); - if (expected_id == null) + if (expected_id == null) { peerID.setID(id); - else if (Arrays.equals(expected_id, id)) - _log.debug("Handshake got matching IDs with " + toString()); - else + } else if (Arrays.equals(expected_id, id)) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Handshake got matching IDs with " + toString()); + } else { throw new IOException("Unexpected peerID '" + PeerID.idencode(id) + "' expected '" + PeerID.idencode(expected_id) + "'"); + } } else { - _log.debug("Already have din [" + sock + "] with " + toString()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Already have din [" + sock + "] with " + toString()); } PeerConnectionIn in = new PeerConnectionIn(this, din); @@ -233,7 +239,8 @@ public class Peer implements Comparable state = s; listener.connected(this); - _log.debug("Start running the reader with " + toString()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Start running the reader with " + toString()); // Use this thread for running the incomming connection. // The outgoing connection creates its own Thread. out.startup(); @@ -283,7 +290,8 @@ public class Peer implements Comparable dout.write(my_id); dout.flush(); - _log.debug("Wrote my shared hash and ID to " + toString()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Wrote my shared hash and ID to " + toString()); // Handshake read - header byte b = din.readByte(); @@ -310,7 +318,8 @@ public class Peer implements Comparable // Handshake read - peer id din.readFully(bs); - _log.debug("Read the remote side's hash and peerID fully from " + toString()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Read the remote side's hash and peerID fully from " + toString()); return bs; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java index c869384371..58ef3ae2db 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java @@ -76,10 +76,12 @@ public class PeerAcceptor // is this working right? try { peerInfoHash = readHash(in); - _log.info("infohash read from " + socket.getPeerDestination().calculateHash().toBase64() - + ": " + Base64.encode(peerInfoHash)); + if (_log.shouldLog(Log.INFO)) + _log.info("infohash read from " + socket.getPeerDestination().calculateHash().toBase64() + + ": " + Base64.encode(peerInfoHash)); } catch (IOException ioe) { - _log.info("Unable to read the infohash from " + socket.getPeerDestination().calculateHash().toBase64()); + if (_log.shouldLog(Log.INFO)) + _log.info("Unable to read the infohash from " + socket.getPeerDestination().calculateHash().toBase64()); throw ioe; } in = new SequenceInputStream(new ByteArrayInputStream(peerInfoHash), in); diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index a1ddaf25db..c1ce6164d2 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -202,7 +202,8 @@ public class SnarkManager implements Snark.CompleteListener { } if (i2cpHost != null) { _util.setI2CPConfig(i2cpHost, i2cpPort, i2cpOpts); - _log.debug("Configuring with I2CP options " + i2cpOpts); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Configuring with I2CP options " + i2cpOpts); } //I2PSnarkUtil.instance().setI2CPConfig("66.111.51.110", 7654, new Properties()); //String eepHost = _config.getProperty(PROP_EEP_HOST); @@ -332,8 +333,9 @@ public class SnarkManager implements Snark.CompleteListener { p.putAll(opts); _util.setI2CPConfig(i2cpHost, port, p); addMessage(_("I2CP and tunnel changes will take effect after stopping all torrents")); - _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts - + "] oldOpts [" + oldOpts + "]"); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts + + "] oldOpts [" + oldOpts + "]"); } else { if (_util.connected()) { _util.disconnect(); @@ -712,7 +714,8 @@ public class SnarkManager implements Snark.CompleteListener { getBWLimit(); while (true) { File dir = getDataDir(); - _log.debug("Directory Monitor loop over " + dir.getAbsolutePath()); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Directory Monitor loop over " + dir.getAbsolutePath()); try { monitorTorrents(dir); } catch (Exception e) {