Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
saros-archive
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
saros
saros-archive
Commits
11fd7215
Commit
11fd7215
authored
15 years ago
by
Christopher Oezbek
Browse files
Options
Downloads
Patches
Plain Diff
[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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/DataTransferManager.java
+25
-7
25 additions, 7 deletions
...e/fu_berlin/inf/dpp/net/internal/DataTransferManager.java
with
25 additions
and
7 deletions
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/DataTransferManager.java
+
25
−
7
View file @
11fd7215
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment