From f3180b3f6f37e674506d350f25b048d52e546edd Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 27 Jun 2014 15:14:21 +0000
Subject: [PATCH] SAM client logging cleanup
---
.../src/net/i2p/sam/client/SAMStreamSend.java | 41 +++++++++-----
.../src/net/i2p/sam/client/SAMStreamSink.java | 56 ++++++++++++-------
2 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
index cd70161eb6..40629bf839 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
@@ -61,15 +61,19 @@ public class SAMStreamSend {
}
public void startup() {
- _log.debug("Starting up");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Starting up");
boolean ok = connect();
- _log.debug("Connected: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Connected: " + ok);
if (ok) {
_reader = new SAMReader(_context, _samIn, _eventHandler);
_reader.startReading();
- _log.debug("Reader created");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Reader created");
String ourDest = handshake();
- _log.debug("Handshake complete. we are " + ourDest);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Handshake complete. we are " + ourDest);
if (ourDest != null) {
send();
}
@@ -85,7 +89,8 @@ public class SAMStreamSend {
}
if (sender != null) {
sender.closed();
- _log.debug("Connection " + sender.getConnectionId() + " closed to " + sender.getDestination());
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Connection " + sender.getConnectionId() + " closed to " + sender.getDestination());
} else {
_log.error("wtf, not connected to " + id + " but we were just closed?");
}
@@ -109,24 +114,30 @@ public class SAMStreamSend {
try {
_samOut.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
_samOut.flush();
- _log.debug("Hello sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Hello sent");
boolean ok = _eventHandler.waitForHelloReply();
- _log.debug("Hello reply found: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Hello reply found: " + ok);
if (!ok)
throw new IOException("wtf, hello failed?");
String req = "SESSION CREATE STYLE=STREAM DESTINATION=TRANSIENT " + _conOptions + "\n";
_samOut.write(req.getBytes());
_samOut.flush();
- _log.debug("Session create sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Session create sent");
ok = _eventHandler.waitForSessionCreateReply();
- _log.debug("Session create reply found: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Session create reply found: " + ok);
req = "NAMING LOOKUP NAME=ME\n";
_samOut.write(req.getBytes());
_samOut.flush();
- _log.debug("Naming lookup sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Naming lookup sent");
String destination = _eventHandler.waitForNamingReply("ME");
- _log.debug("Naming lookup reply found: " + destination);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Naming lookup reply found: " + destination);
if (destination == null) {
_log.error("No naming lookup reply found!");
return null;
@@ -213,10 +224,12 @@ public class SAMStreamSend {
int read = _in.read(data);
long now = _context.clock().now();
if (read == -1) {
- _log.debug("EOF from the data for " + _connectionId + " after " + (now-lastSend));
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("EOF from the data for " + _connectionId + " after " + (now-lastSend));
break;
} else if (read > 0) {
- _log.debug("Sending " + read + " on " + _connectionId + " after " + (now-lastSend));
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Sending " + read + " on " + _connectionId + " after " + (now-lastSend));
lastSend = now;
byte msg[] = ("STREAM SEND ID=" + _connectionId + " SIZE=" + read + "\n").getBytes();
@@ -247,4 +260,4 @@ public class SAMStreamSend {
closed();
}
}
-}
\ No newline at end of file
+}
diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
index 31d983ee15..666b7116d8 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
@@ -60,26 +60,33 @@ public class SAMStreamSink {
}
public void startup() {
- _log.debug("Starting up");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Starting up");
boolean ok = connect();
- _log.debug("Connected: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Connected: " + ok);
if (ok) {
_reader = new SAMReader(_context, _samIn, _eventHandler);
_reader.startReading();
- _log.debug("Reader created");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Reader created");
String ourDest = handshake();
- _log.debug("Handshake complete. we are " + ourDest);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Handshake complete. we are " + ourDest);
if (ourDest != null) {
//boolean written =
- writeDest(ourDest);
- _log.debug("Dest written");
+ writeDest(ourDest);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Dest written");
}
}
}
private class SinkEventHandler extends SAMEventHandler {
+
public SinkEventHandler(I2PAppContext ctx) { super(ctx); }
- @Override
+
+ @Override
public void streamClosedReceived(String result, int id, String message) {
Sink sink = null;
synchronized (_remotePeers) {
@@ -87,12 +94,14 @@ public class SAMStreamSink {
}
if (sink != null) {
sink.closed();
- _log.debug("Connection " + sink.getConnectionId() + " closed to " + sink.getDestination());
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Connection " + sink.getConnectionId() + " closed to " + sink.getDestination());
} else {
_log.error("wtf, not connected to " + id + " but we were just closed?");
}
}
- @Override
+
+ @Override
public void streamDataReceived(int id, byte data[], int offset, int length) {
Sink sink = null;
synchronized (_remotePeers) {
@@ -104,9 +113,11 @@ public class SAMStreamSink {
_log.error("wtf, not connected to " + id + " but we received " + length + "?");
}
}
- @Override
+
+ @Override
public void streamConnectedReceived(String dest, int id) {
- _log.debug("Connection " + id + " received from " + dest);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Connection " + id + " received from " + dest);
try {
Sink sink = new Sink(id, dest);
@@ -136,24 +147,30 @@ public class SAMStreamSink {
try {
_samOut.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
_samOut.flush();
- _log.debug("Hello sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Hello sent");
boolean ok = _eventHandler.waitForHelloReply();
- _log.debug("Hello reply found: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Hello reply found: " + ok);
if (!ok)
throw new IOException("wtf, hello failed?");
String req = "SESSION CREATE STYLE=STREAM DESTINATION=" + _destFile + " " + _conOptions + "\n";
_samOut.write(req.getBytes());
_samOut.flush();
- _log.debug("Session create sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Session create sent");
ok = _eventHandler.waitForSessionCreateReply();
- _log.debug("Session create reply found: " + ok);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Session create reply found: " + ok);
req = "NAMING LOOKUP NAME=ME\n";
_samOut.write(req.getBytes());
_samOut.flush();
- _log.debug("Naming lookup sent");
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Naming lookup sent");
String destination = _eventHandler.waitForNamingReply("ME");
- _log.debug("Naming lookup reply found: " + destination);
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Naming lookup reply found: " + destination);
if (destination == null) {
_log.error("No naming lookup reply found!");
return null;
@@ -230,10 +247,11 @@ public class SAMStreamSink {
closed();
return;
}
- _log.debug("Received " + len + " on " + _connectionId + " after " + (_context.clock().now()-_lastReceivedOn)
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Received " + len + " on " + _connectionId + " after " + (_context.clock().now()-_lastReceivedOn)
+ "ms with " + _remoteDestination.substring(0,6));
_lastReceivedOn = _context.clock().now();
}
}
-}
\ No newline at end of file
+}
--
GitLab