Remove local ufrag from log messages. (#196)

Not needed now that we have logger2, which has it in the log context.
This commit is contained in:
Jonathan Lennox 2020-04-07 16:33:35 -04:00 committed by GitHub
parent 36f732ba1c
commit 35e149848e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 19 deletions

View File

@ -660,7 +660,7 @@ public class Agent
IOException IOException
{ {
logger.info("Gathering candidates for component " + logger.info("Gathering candidates for component " +
component.toShortString() +". Local ufrag " + getLocalUfrag()); component.toShortString() +".");
if (useHostHarvester()) if (useHostHarvester())
{ {
@ -750,8 +750,7 @@ public class Agent
{ {
synchronized(startLock) synchronized(startLock)
{ {
logger.info("Start ICE connectivity establishment. Local ufrag " logger.info("Start ICE connectivity establishment.");
+ getLocalUfrag());
shutdown = false; shutdown = false;
pruneNonMatchedStreams(); pruneNonMatchedStreams();
@ -962,7 +961,7 @@ public class Agent
if (!oldState.equals(newState)) if (!oldState.equals(newState))
{ {
logger.info("ICE state changed from " + oldState + " to " logger.info("ICE state changed from " + oldState + " to "
+ newState + ". Local ufrag " + getLocalUfrag()); + newState + ".");
fireStateChange(oldState, newState); fireStateChange(oldState, newState);
return true; return true;
@ -1998,8 +1997,7 @@ public class Agent
StringBuffer buf StringBuffer buf
= new StringBuffer( "Harvester used for selected pair for "); = new StringBuffer( "Harvester used for selected pair for ");
buf.append(component.toShortString()); buf.append(component.toShortString());
buf.append(" (local ufrag ").append(getLocalUfrag()); buf.append(": ");
buf.append("): ");
if (selectedPair == null) if (selectedPair == null)
{ {

View File

@ -438,8 +438,7 @@ public class Component
.getParentAgent() .getParentAgent()
.createCandidatePair(localCnd, remoteCnd); .createCandidatePair(localCnd, remoteCnd);
logger.info("new Pair added: " + pair.toShortString() logger.info("new Pair added: " + pair.toShortString()
+ ". Local ufrag " + ".");
+ parentStream.getParentAgent().getLocalUfrag());
checkList.add(pair); checkList.add(pair);
} }
} }

View File

@ -139,8 +139,7 @@ class ConnectivityCheckClient
if (streamsWithPendingConnectivityEstablishment.size() > 0) if (streamsWithPendingConnectivityEstablishment.size() > 0)
{ {
logger.info("Start connectivity checks. Local ufrag " logger.info("Start connectivity checks.");
+ parentAgent.getLocalUfrag());
startChecks( startChecks(
streamsWithPendingConnectivityEstablishment streamsWithPendingConnectivityEstablishment
.get(0).getCheckList()); .get(0).getCheckList());
@ -518,8 +517,7 @@ class ConnectivityCheckClient
logger.debug(() -> "Received a success response with no " logger.debug(() -> "Received a success response with no "
+ "XOR_MAPPED_ADDRESS attribute."); + "XOR_MAPPED_ADDRESS attribute.");
logger.info("Pair failed (no XOR-MAPPED-ADDRESS): " logger.info("Pair failed (no XOR-MAPPED-ADDRESS): "
+ checkedPair.toShortString() + ". Local ufrag" + checkedPair.toShortString() + ".");
+ parentAgent.getLocalUfrag());
checkedPair.setStateFailed(); checkedPair.setStateFailed();
return; //malformed error response return; //malformed error response
} }
@ -589,7 +587,7 @@ class ConnectivityCheckClient
{ {
logger.info("Receive a peer-reflexive candidate: " logger.info("Receive a peer-reflexive candidate: "
+ peerReflexiveCandidate.getTransportAddress() + peerReflexiveCandidate.getTransportAddress()
+ ". Local ufrag " + parentAgent.getLocalUfrag()); + ".");
} }
} }
@ -627,8 +625,7 @@ class ConnectivityCheckClient
if (checkedPair.getParentComponent().getSelectedPair() == null) if (checkedPair.getParentComponent().getSelectedPair() == null)
{ {
logger.info("Pair succeeded: " + checkedPair.toShortString() logger.info("Pair succeeded: " + checkedPair.toShortString()
+ ". Local ufrag " + ".");
+ parentAgent.getLocalUfrag());
} }
checkedPair.setStateSucceeded(); checkedPair.setStateSucceeded();
} }
@ -637,7 +634,7 @@ class ConnectivityCheckClient
{ {
if (validPair.getParentComponent().getSelectedPair() == null) if (validPair.getParentComponent().getSelectedPair() == null)
logger.info("Pair validated: " + validPair.toShortString() logger.info("Pair validated: " + validPair.toShortString()
+ ". Local ufrag " + parentAgent.getLocalUfrag()); + ".");
parentAgent.validatePair(validPair); parentAgent.validatePair(validPair);
} }
@ -709,7 +706,7 @@ class ConnectivityCheckClient
" USE-CANDIDATE:" + " USE-CANDIDATE:" +
(request.containsAttribute(Attribute.USE_CANDIDATE) || (request.containsAttribute(Attribute.USE_CANDIDATE) ||
checkedPair.useCandidateSent()) checkedPair.useCandidateSent())
+ ". Local ufrag " + parentAgent.getLocalUfrag()); + ".");
} }
//If the agent was a controlling agent, and it had included a USE- //If the agent was a controlling agent, and it had included a USE-
@ -722,7 +719,7 @@ class ConnectivityCheckClient
{ {
logger.info("Nomination confirmed for pair: " logger.info("Nomination confirmed for pair: "
+ validPair.toShortString() + validPair.toShortString()
+ ". Loal ufrag " + parentAgent.getLocalUfrag()); + ".");
parentAgent.nominationConfirmed( validPair ); parentAgent.nominationConfirmed( validPair );
} }
else else

View File

@ -138,7 +138,7 @@ public class DefaultNominator
CandidatePair validPair = (CandidatePair)evt.getSource(); CandidatePair validPair = (CandidatePair)evt.getSource();
logger.info("Nominate (first valid): " + validPair.toShortString() logger.info("Nominate (first valid): " + validPair.toShortString()
+ ". Local ufrag " + parentAgent.getLocalUfrag()); + ".");
parentAgent.nominate(validPair); parentAgent.nominate(validPair);
} }
} }