Skip to content
Snippets Groups Projects
Commit 11fd7215 authored by Christopher Oezbek's avatar Christopher Oezbek
Browse files

[LOG] Downgrade logging if Jingle is used for sending activities, because these are logged anyway

parent a8f4544e
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ import de.fu_berlin.inf.dpp.net.JID; ...@@ -39,6 +39,7 @@ import de.fu_berlin.inf.dpp.net.JID;
import de.fu_berlin.inf.dpp.net.IncomingTransferObject.IncomingTransferObjectExtensionProvider; import de.fu_berlin.inf.dpp.net.IncomingTransferObject.IncomingTransferObjectExtensionProvider;
import de.fu_berlin.inf.dpp.net.business.ActivitiesHandler; import de.fu_berlin.inf.dpp.net.business.ActivitiesHandler;
import de.fu_berlin.inf.dpp.net.business.DispatchThreadContext; import de.fu_berlin.inf.dpp.net.business.DispatchThreadContext;
import de.fu_berlin.inf.dpp.net.internal.TransferDescription.FileTransferType;
import de.fu_berlin.inf.dpp.net.jingle.IJingleFileTransferListener; import de.fu_berlin.inf.dpp.net.jingle.IJingleFileTransferListener;
import de.fu_berlin.inf.dpp.net.jingle.JingleFileTransferManager; import de.fu_berlin.inf.dpp.net.jingle.JingleFileTransferManager;
import de.fu_berlin.inf.dpp.net.jingle.JingleSessionException; import de.fu_berlin.inf.dpp.net.jingle.JingleSessionException;
...@@ -222,9 +223,17 @@ public class DataTransferManager implements ConnectionSessionListener { ...@@ -222,9 +223,17 @@ public class DataTransferManager implements ConnectionSessionListener {
try { try {
// TODO Put size in TransferDescription, so we can // TODO Put size in TransferDescription, so we can
// display it here // display it here
log.debug("[" + getTransferMode().toString() if (description.type == FileTransferType.ACTIVITY_TRANSFER) {
+ "] Starting incoming file transfer: " if (log.isTraceEnabled()) {
+ description.toString()); log.trace("[" + getTransferMode().toString()
+ "] Starting incoming data transfer: "
+ description.toString());
}
} else {
log.debug("[" + getTransferMode().toString()
+ "] Starting incoming data transfer: "
+ description.toString());
}
long startTime = System.nanoTime(); long startTime = System.nanoTime();
...@@ -232,10 +241,19 @@ public class DataTransferManager implements ConnectionSessionListener { ...@@ -232,10 +241,19 @@ public class DataTransferManager implements ConnectionSessionListener {
long duration = Math.max(0, System.nanoTime() - startTime) / 1000000; long duration = Math.max(0, System.nanoTime() - startTime) / 1000000;
log.debug("[" + getTransferMode().toString() if (description.type == FileTransferType.ACTIVITY_TRANSFER) {
+ "] Finished incoming file transfer: " if (log.isTraceEnabled()) {
+ description.toString() + ", size: " log.trace("[" + getTransferMode().toString()
+ Util.throughput(content.length, duration)); + "] Finished incoming data transfer: "
+ description.toString() + ", size: "
+ Util.throughput(content.length, duration));
}
} else {
log.debug("[" + getTransferMode().toString()
+ "] Finished incoming data transfer: "
+ description.toString() + ", size: "
+ Util.throughput(content.length, duration));
}
transferModeDispatch.transferFinished(description transferModeDispatch.transferFinished(description
.getSender(), getTransferMode(), true, content.length, .getSender(), getTransferMode(), true, content.length,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment