You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/02/20 07:07:53 UTC
[maven-surefire] branch maven2surefire-jvm-communication updated:
added more logs
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch maven2surefire-jvm-communication
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/maven2surefire-jvm-communication by this push:
new 03e794b added more logs
03e794b is described below
commit 03e794bc5fffe668379493ce689d0b7247d1d634
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Feb 20 08:07:47 2020 +0100
added more logs
---
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 ++
.../maven/plugin/surefire/booterclient/ForkStarter.java | 12 ++++++++----
.../maven/plugin/surefire/extensions/LegacyForkChannel.java | 2 +-
.../plugin/surefire/extensions/SurefireForkChannel.java | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 6bab194..43596a0 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2283,6 +2283,8 @@ public abstract class AbstractSurefireMojo
ForkNodeFactory forkNode = getForkNodeFactory();
+ getConsoleLogger().debug( "Found implementation of fork node factory: " + forkNode.getClass() );
+
if ( canExecuteProviderWithModularPath( platform ) )
{
return new ModularClasspathForkConfiguration( bootClasspath,
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 3eb7d09..9e57d74 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -577,7 +577,8 @@ public class ForkStarter
Long pluginPid = forkConfiguration.getPluginPlatform().getPluginPid();
log.debug( "Determined Maven Process ID " + pluginPid );
String connectionString = forkChannel.getForkNodeConnectionString();
- log.debug( "Fork Channel [" + forkNumber + "] connection string " + connectionString );
+ log.debug( "Fork Channel [" + forkNumber + "] connection string '" + connectionString
+ + "' for the implementation " + forkChannel.getClass() );
surefireProperties = booterSerializer.serialize( providerProperties, providerConfiguration,
startupConfiguration, testSet, readTestsFromInStream, pluginPid, forkNumber, connectionString );
@@ -635,16 +636,16 @@ public class ForkStarter
closer.addCloseable( streams );
forkChannel.connectToClient();
+ log.debug( "Fork Channel [" + forkNumber + "] connected to the client." );
in = forkChannel.bindCommandReader( commandReader, streams.getStdInChannel() );
in.start();
- EventHandler stdErrConsumer = new NativeStdErrStreamConsumer( reporter );
-
out = forkChannel.bindEventHandler( eventConsumer, countdownCloseable, streams.getStdOutChannel() );
out.start();
- err = new LineConsumerThread( "std-err-fork-" + forkNumber, streams.getStdErrChannel(),
+ EventHandler stdErrConsumer = new NativeStdErrStreamConsumer( reporter );
+ err = new LineConsumerThread( "fork-" + forkNumber + "-err-thread-", streams.getStdErrChannel(),
stdErrConsumer, countdownCloseable );
err.start();
@@ -662,6 +663,7 @@ public class ForkStarter
}
catch ( InterruptedException e )
{
+ log.error( "Closing the streams after (InterruptedException) '" + e.getLocalizedMessage() + "'" );
// maybe implement it in the Future.cancel() of the extension or similar
in.disable();
out.disable();
@@ -678,6 +680,8 @@ public class ForkStarter
}
finally
{
+ log.debug( "Closing the fork " + forkNumber + " after "
+ + ( forkClient.isSaidGoodBye() ? "saying GoodBye." : "not saying Good Bye." ) );
currentForkClients.remove( forkClient );
try
{
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
index 1df3326..17e4c1d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
@@ -71,7 +71,7 @@ final class LegacyForkChannel extends ForkChannel
ReadableByteChannel stdOut )
{
// todo develop Event and EventConsumerThread, see the algorithm in ForkedChannelDecoder#handleEvent()
- return new LineConsumerThread( "std-out-fork-" + getForkChannelId(), stdOut,
+ return new LineConsumerThread( "fork-" + getForkChannelId() + "-event-thread-", stdOut,
eventHandler, countdownCloseable );
}
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
index 9f035e4..616b965 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
@@ -112,7 +112,7 @@ final class SurefireForkChannel extends ForkChannel
ReadableByteChannel stdOut )
{
// todo develop Event and EventConsumerThread, see the algorithm in ForkedChannelDecoder#handleEvent()
- return new LineConsumerThread( "events-fork-" + getForkChannelId(), channel,
+ return new LineConsumerThread( "fork-" + getForkChannelId() + "-event-thread-", channel,
eventHandler, countdownCloseable );
}