ref: Clean up logger usage.
This commit is contained in:
parent
15981cf5f3
commit
f637413a98
@ -131,9 +131,8 @@ public class RoleConflictResolutionTest
|
|||||||
CandidatePair selectedPair = component.getSelectedPair();
|
CandidatePair selectedPair = component.getSelectedPair();
|
||||||
if (selectedPair != null)
|
if (selectedPair != null)
|
||||||
{
|
{
|
||||||
logger.info( peer.toString() + ": selected pair for " +
|
logger.info(
|
||||||
"component " + component.getName() + " :" +
|
peer + ": selected pair for " + "component " + component.getName() + " :" + selectedPair);
|
||||||
selectedPair.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -419,8 +419,7 @@ public class Ice
|
|||||||
stream, Transport.UDP, rtpPort, rtpPort, rtpPort + 100);
|
stream, Transport.UDP, rtpPort, rtpPort, rtpPort + 100);
|
||||||
|
|
||||||
long endTime = System.currentTimeMillis();
|
long endTime = System.currentTimeMillis();
|
||||||
logger.info("RTP Component created in "
|
logger.info("RTP Component created in " + (endTime - startTime) + " ms");
|
||||||
+ (endTime - startTime) + " ms");
|
|
||||||
startTime = endTime;
|
startTime = endTime;
|
||||||
//rtcpComp
|
//rtcpComp
|
||||||
agent.createComponent(
|
agent.createComponent(
|
||||||
|
|||||||
@ -40,8 +40,7 @@ public class IcePseudoTcp
|
|||||||
/**
|
/**
|
||||||
* The logger.
|
* The logger.
|
||||||
*/
|
*/
|
||||||
private static final Logger logger =
|
private static final Logger logger = Logger.getLogger(IcePseudoTcp.class.getName());
|
||||||
Logger.getLogger(IcePseudoTcp.class.getName());
|
|
||||||
private static long startTime;
|
private static long startTime;
|
||||||
/**
|
/**
|
||||||
* Local job thread variable
|
* Local job thread variable
|
||||||
@ -132,9 +131,7 @@ public class IcePseudoTcp
|
|||||||
stream, Transport.UDP, pTcpPort, pTcpPort, pTcpPort + 100);
|
stream, Transport.UDP, pTcpPort, pTcpPort, pTcpPort + 100);
|
||||||
|
|
||||||
long endTime = System.currentTimeMillis();
|
long endTime = System.currentTimeMillis();
|
||||||
logger.log(Level.INFO,
|
logger.info("UDP Component created in " + (endTime - startTime) + " ms");
|
||||||
"UDP Component created in " + (endTime - startTime) + " ms");
|
|
||||||
startTime = endTime;
|
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
@ -154,18 +151,12 @@ public class IcePseudoTcp
|
|||||||
|
|
||||||
Object iceProcessingState = evt.getNewValue();
|
Object iceProcessingState = evt.getNewValue();
|
||||||
|
|
||||||
logger.log(
|
logger.info("Local agent entered the " + iceProcessingState + " state.");
|
||||||
Level.INFO,
|
|
||||||
"Local agent entered the " + iceProcessingState
|
|
||||||
+ " state.");
|
|
||||||
if (iceProcessingState == IceProcessingState.COMPLETED)
|
if (iceProcessingState == IceProcessingState.COMPLETED)
|
||||||
{
|
{
|
||||||
logger.log(
|
logger.info("Local - Total ICE processing time: " + (processingEndTime - startTime) + "ms");
|
||||||
Level.INFO,
|
|
||||||
"Local - Total ICE processing time: "
|
|
||||||
+ (processingEndTime - startTime) + "ms");
|
|
||||||
Agent agent = (Agent) evt.getSource();
|
Agent agent = (Agent) evt.getSource();
|
||||||
logger.log(Level.INFO, "Local: Create pseudo tcp stream");
|
logger.info("Local: Create pseudo tcp stream");
|
||||||
IceMediaStream dataStream = agent.getStream("data");
|
IceMediaStream dataStream = agent.getStream("data");
|
||||||
Component udpComponent = dataStream.getComponents().get(0);
|
Component udpComponent = dataStream.getComponents().get(0);
|
||||||
CandidatePair selectedPair = udpComponent.getSelectedPair();
|
CandidatePair selectedPair = udpComponent.getSelectedPair();
|
||||||
@ -175,25 +166,20 @@ public class IcePseudoTcp
|
|||||||
= selectedPair.getLocalCandidate();
|
= selectedPair.getLocalCandidate();
|
||||||
Candidate<?> remoteCandidate
|
Candidate<?> remoteCandidate
|
||||||
= selectedPair.getRemoteCandidate();
|
= selectedPair.getRemoteCandidate();
|
||||||
logger.log(Level.INFO, "Local: " + localCandidate);
|
logger.info("Local: " + localCandidate);
|
||||||
logger.log(Level.INFO, "Remote: " + remoteCandidate);
|
logger.info("Remote: " + remoteCandidate);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
localJob = new LocalPseudoTcpJob(
|
localJob = new LocalPseudoTcpJob(selectedPair.getDatagramSocket());
|
||||||
selectedPair.getDatagramSocket());
|
|
||||||
}
|
}
|
||||||
catch (UnknownHostException ex)
|
catch (UnknownHostException ex)
|
||||||
{
|
{
|
||||||
logger.log(Level.SEVERE,
|
logger.severe("Error while trying to create local pseudotcp thread " + ex);
|
||||||
"Error while trying to create"
|
|
||||||
+ " local pseudotcp thread " + ex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.log(
|
logger.info("Failed to select any candidate pair");
|
||||||
Level.INFO,
|
|
||||||
"Failed to select any candidate pair");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -207,8 +193,7 @@ public class IcePseudoTcp
|
|||||||
* garbage collection.
|
* garbage collection.
|
||||||
*/
|
*/
|
||||||
if ((localJob != null)
|
if ((localJob != null)
|
||||||
&& (iceProcessingState
|
&& (iceProcessingState == IceProcessingState.TERMINATED))
|
||||||
== IceProcessingState.TERMINATED))
|
|
||||||
{
|
{
|
||||||
localJob.start();
|
localJob.start();
|
||||||
}
|
}
|
||||||
@ -236,18 +221,13 @@ public class IcePseudoTcp
|
|||||||
|
|
||||||
Object iceProcessingState = evt.getNewValue();
|
Object iceProcessingState = evt.getNewValue();
|
||||||
|
|
||||||
logger.log(
|
logger.info("Remote agent entered the " + iceProcessingState + " state.");
|
||||||
Level.INFO,
|
|
||||||
"Remote agent entered the " + iceProcessingState
|
|
||||||
+ " state.");
|
|
||||||
if (iceProcessingState == IceProcessingState.COMPLETED)
|
if (iceProcessingState == IceProcessingState.COMPLETED)
|
||||||
{
|
{
|
||||||
logger.log(Level.INFO,
|
logger.info("Remote: Total ICE processing time: " + (processingEndTime - startTime) + " ms ");
|
||||||
"Remote: Total ICE processing time: "
|
|
||||||
+ (processingEndTime - startTime) + " ms ");
|
|
||||||
Agent agent = (Agent) evt.getSource();
|
Agent agent = (Agent) evt.getSource();
|
||||||
|
|
||||||
logger.log(Level.INFO, "Remote: Create pseudo tcp stream");
|
logger.info("Remote: Create pseudo tcp stream");
|
||||||
IceMediaStream dataStream = agent.getStream("data");
|
IceMediaStream dataStream = agent.getStream("data");
|
||||||
Component udpComponent = dataStream.getComponents().get(0);
|
Component udpComponent = dataStream.getComponents().get(0);
|
||||||
CandidatePair usedPair = udpComponent.getSelectedPair();
|
CandidatePair usedPair = udpComponent.getSelectedPair();
|
||||||
@ -257,10 +237,8 @@ public class IcePseudoTcp
|
|||||||
= usedPair.getLocalCandidate();
|
= usedPair.getLocalCandidate();
|
||||||
Candidate<?> remoteCandidate
|
Candidate<?> remoteCandidate
|
||||||
= usedPair.getRemoteCandidate();
|
= usedPair.getRemoteCandidate();
|
||||||
logger.log(Level.INFO,
|
logger.info("Remote: Local address " + localCandidate);
|
||||||
"Remote: Local address " + localCandidate);
|
logger.info("Remote: Peer address " + remoteCandidate);
|
||||||
logger.log(Level.INFO,
|
|
||||||
"Remote: Peer address " + remoteCandidate);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
remoteJob = new RemotePseudoTcpJob(
|
remoteJob = new RemotePseudoTcpJob(
|
||||||
@ -269,15 +247,12 @@ public class IcePseudoTcp
|
|||||||
}
|
}
|
||||||
catch (UnknownHostException ex)
|
catch (UnknownHostException ex)
|
||||||
{
|
{
|
||||||
logger.log(Level.SEVERE,
|
logger.severe("Error while trying to create remote pseudotcp thread " + ex);
|
||||||
"Error while trying to create"
|
|
||||||
+ " remote pseudotcp thread " + ex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.log(Level.SEVERE,
|
logger.severe("Remote: Failed to select any candidate pair");
|
||||||
"Remote: Failed to select any candidate pair");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -313,15 +288,11 @@ public class IcePseudoTcp
|
|||||||
int remotePort = 6000;
|
int remotePort = 6000;
|
||||||
|
|
||||||
Agent localAgent = createAgent(localPort);
|
Agent localAgent = createAgent(localPort);
|
||||||
localAgent.setNominationStrategy(
|
localAgent.setNominationStrategy(NominationStrategy.NOMINATE_HIGHEST_PRIO);
|
||||||
NominationStrategy.NOMINATE_HIGHEST_PRIO);
|
Agent remotePeer = createAgent(remotePort);
|
||||||
Agent remotePeer =
|
|
||||||
createAgent(remotePort);
|
|
||||||
|
|
||||||
localAgent.addStateChangeListener(
|
localAgent.addStateChangeListener(new IcePseudoTcp.LocalIceProcessingListener());
|
||||||
new IcePseudoTcp.LocalIceProcessingListener());
|
remotePeer.addStateChangeListener(new IcePseudoTcp.RemoteIceProcessingListener());
|
||||||
remotePeer.addStateChangeListener(
|
|
||||||
new IcePseudoTcp.RemoteIceProcessingListener());
|
|
||||||
|
|
||||||
//let them fight ... fights forge character.
|
//let them fight ... fights forge character.
|
||||||
localAgent.setControlling(true);
|
localAgent.setControlling(true);
|
||||||
@ -344,10 +315,8 @@ public class IcePseudoTcp
|
|||||||
stream.setRemotePassword(localAgent.getLocalPassword());
|
stream.setRemotePassword(localAgent.getLocalPassword());
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.log(Level.INFO, "Total candidate gathering time: {0} ms",
|
logger.log(Level.INFO, "Total candidate gathering time: {0} ms", (endTime - startTime));
|
||||||
(endTime - startTime));
|
logger.log(Level.INFO, "LocalAgent: {0}", localAgent);
|
||||||
logger.log(Level.INFO, "LocalAgent: {0}",
|
|
||||||
localAgent);
|
|
||||||
|
|
||||||
localAgent.startConnectivityEstablishment();
|
localAgent.startConnectivityEstablishment();
|
||||||
|
|
||||||
@ -359,8 +328,7 @@ public class IcePseudoTcp
|
|||||||
|
|
||||||
if (dataStream != null)
|
if (dataStream != null)
|
||||||
{
|
{
|
||||||
logger.log(Level.INFO,
|
logger.info("Local data clist:" + dataStream.getCheckList());
|
||||||
"Local data clist:" + dataStream.getCheckList());
|
|
||||||
}
|
}
|
||||||
//wait for one of the agents to complete it's job
|
//wait for one of the agents to complete it's job
|
||||||
synchronized (remoteAgentMonitor)
|
synchronized (remoteAgentMonitor)
|
||||||
@ -369,16 +337,16 @@ public class IcePseudoTcp
|
|||||||
}
|
}
|
||||||
if (remoteJob != null)
|
if (remoteJob != null)
|
||||||
{
|
{
|
||||||
logger.log(Level.FINEST, "Remote thread join started");
|
logger.finest("Remote thread join started");
|
||||||
remoteJob.join();
|
remoteJob.join();
|
||||||
logger.log(Level.FINEST, "Remote thread joined");
|
logger.finest("Remote thread joined");
|
||||||
}
|
}
|
||||||
remotePeer.free();
|
remotePeer.free();
|
||||||
if (localJob != null)
|
if (localJob != null)
|
||||||
{
|
{
|
||||||
logger.log(Level.FINEST, "Local thread join started");
|
logger.finest("Local thread join started");
|
||||||
localJob.join();
|
localJob.join();
|
||||||
logger.log(Level.FINEST, "Local thread joined");
|
logger.finest("Local thread joined");
|
||||||
}
|
}
|
||||||
localAgent.free();
|
localAgent.free();
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
@ -397,15 +365,12 @@ public class IcePseudoTcp
|
|||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
logger.log(Level.FINEST, "Local pseudotcp worker started");
|
logger.finest("Local pseudotcp worker started");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.log(Level.INFO,
|
logger.info("Local pseudotcp is using: " + dgramSocket.getLocalSocketAddress()+dgramSocket);
|
||||||
"Local pseudotcp is using: "
|
|
||||||
+ dgramSocket.getLocalSocketAddress()+dgramSocket);
|
|
||||||
|
|
||||||
PseudoTcpSocket socket = new PseudoTcpSocketFactory().
|
PseudoTcpSocket socket = new PseudoTcpSocketFactory().createSocket(dgramSocket);
|
||||||
createSocket(dgramSocket);
|
|
||||||
socket.setConversationID(1073741824);
|
socket.setConversationID(1073741824);
|
||||||
socket.setMTU(1500);
|
socket.setMTU(1500);
|
||||||
socket.setDebugName("L");
|
socket.setDebugName("L");
|
||||||
@ -415,7 +380,7 @@ public class IcePseudoTcp
|
|||||||
while (read != TEST_BYTES_COUNT)
|
while (read != TEST_BYTES_COUNT)
|
||||||
{
|
{
|
||||||
read += socket.getInputStream().read(buffer);
|
read += socket.getInputStream().read(buffer);
|
||||||
logger.log(Level.FINEST, "Local job read: " + read);
|
logger.finest("Local job read: " + read);
|
||||||
}
|
}
|
||||||
//TODO: close when all received data is acked
|
//TODO: close when all received data is acked
|
||||||
//socket.close();
|
//socket.close();
|
||||||
@ -424,7 +389,7 @@ public class IcePseudoTcp
|
|||||||
{
|
{
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
logger.log(Level.FINEST, "Local pseudotcp worker finished");
|
logger.finest("Local pseudotcp worker finished");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -444,13 +409,11 @@ public class IcePseudoTcp
|
|||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
logger.log(Level.FINEST, "Remote pseudotcp worker started");
|
logger.finest("Remote pseudotcp worker started");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.log(Level.INFO,
|
logger.info("Remote pseudotcp is using: " + dgramSocket.getLocalSocketAddress()
|
||||||
"Remote pseudotcp is using: " +
|
+ " and will communicate with: " + peerAddr);
|
||||||
dgramSocket.getLocalSocketAddress()
|
|
||||||
+" and will comunicate with: " + peerAddr);
|
|
||||||
PseudoTcpSocket socket = new PseudoTcpSocketFactory().
|
PseudoTcpSocket socket = new PseudoTcpSocketFactory().
|
||||||
createSocket(dgramSocket);
|
createSocket(dgramSocket);
|
||||||
socket.setConversationID(1073741824);
|
socket.setConversationID(1073741824);
|
||||||
@ -465,15 +428,13 @@ public class IcePseudoTcp
|
|||||||
//Socket will be closed by the iceAgent
|
//Socket will be closed by the iceAgent
|
||||||
//socket.close();
|
//socket.close();
|
||||||
end = System.currentTimeMillis();
|
end = System.currentTimeMillis();
|
||||||
logger.log(Level.INFO,
|
logger.info("Transferred " + TEST_BYTES_COUNT + " bytes in " + ((end - start) / 1000) + " sec");
|
||||||
"Transferred " + TEST_BYTES_COUNT
|
|
||||||
+ " bytes in " + ((end - start) / 1000) + " sec");
|
|
||||||
}
|
}
|
||||||
catch (IOException e)
|
catch (IOException e)
|
||||||
{
|
{
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
logger.log(Level.FINEST, "Remote pseudotcp worker finished");
|
logger.finest("Remote pseudotcp worker finished");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user