diff options
author | Laurent Fasani | 2016-05-24 08:25:43 +0000 |
---|---|---|
committer | Eike Stepper | 2016-05-24 09:23:12 +0000 |
commit | 192a73ba2a787f9361d49826b87c76af85b14ac6 (patch) | |
tree | e8e98b4a48a44d7dce89f2308593b696a6eec47d /plugins/org.eclipse.emf.cdo.server.net4j | |
parent | ea68cbd330ca4e56b611aed0872f98777e3b02cf (diff) | |
download | cdo-192a73ba2a787f9361d49826b87c76af85b14ac6.tar.gz cdo-192a73ba2a787f9361d49826b87c76af85b14ac6.tar.xz cdo-192a73ba2a787f9361d49826b87c76af85b14ac6.zip |
[494314] Add user information to Signal traces when possible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=494314
Change-Id: Icdb5c76ed610a38a6075e2487177c7b404af3828
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
Signed-off-by: Eike Stepper <stepper@esc-net.de>
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
2 files changed, 28 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java index c686ad631f..59525f5e1b 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java @@ -88,6 +88,20 @@ public abstract class CDOServerIndication extends IndicationWithResponse } @Override + protected String getAdditionalInfo() + { + String additionalInfo = super.getAdditionalInfo(); + + String userID = getSession().getUserID(); + if (userID != null) + { + additionalInfo += ", user=" + userID; + } + + return additionalInfo; + } + + @Override protected void indicating(ExtendedDataInputStream in) throws Exception { indicating(new CDODataInputImpl(in) diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java index 3ce4dcdd5e..83a6e433a0 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java @@ -45,6 +45,20 @@ public abstract class CDOServerRequest extends Request } @Override + protected String getAdditionalInfo() + { + String additionalInfo = super.getAdditionalInfo(); + + String userID = getSession().getUserID(); + if (userID != null) + { + additionalInfo += ", user=" + userID; + } + + return additionalInfo; + } + + @Override protected final void requesting(ExtendedDataOutputStream out) throws Exception { requesting(new CDODataOutputImpl(out) |