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/05/05 17:34:01 UTC
[maven-surefire] branch SUREFIRE-1788 updated: [SUREFIRE-1788]
Unhandled native logs in SurefireForkChannel
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1788
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/SUREFIRE-1788 by this push:
new c60df38 [SUREFIRE-1788] Unhandled native logs in SurefireForkChannel
c60df38 is described below
commit c60df3807e2f37828f5b25ed62afec89eccafcb5
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue May 5 19:33:51 2020 +0200
[SUREFIRE-1788] Unhandled native logs in SurefireForkChannel
---
.../maven/plugin/surefire/booterclient/ForkStarter.java | 2 +-
.../booterclient/output/NativeStdErrStreamConsumer.java | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
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 65a27c9..428f4e3 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
@@ -646,7 +646,7 @@ public class ForkStarter
out = forkChannel.bindEventHandler( eventConsumer, countdownCloseable, streams.getStdOutChannel() );
out.start();
- EventHandler<String> errConsumer = new NativeStdErrStreamConsumer( reporter );
+ EventHandler<String> errConsumer = new NativeStdErrStreamConsumer( log );
err = new LineConsumerThread( "fork-" + forkNumber + "-err-thread", streams.getStdErrChannel(),
errConsumer, countdownCloseable );
err.start();
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
index bbc5747..d7136ff 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.surefire.booterclient.output;
* under the License.
*/
-import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
+import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.surefire.extensions.EventHandler;
import javax.annotation.Nonnull;
@@ -35,17 +35,16 @@ import javax.annotation.Nonnull;
public final class NativeStdErrStreamConsumer
implements EventHandler<String>
{
- private final DefaultReporterFactory defaultReporterFactory;
+ private final ConsoleLogger logger;
- public NativeStdErrStreamConsumer( DefaultReporterFactory defaultReporterFactory )
+ public NativeStdErrStreamConsumer( ConsoleLogger logger )
{
- this.defaultReporterFactory = defaultReporterFactory;
+ this.logger = logger;
}
@Override
public void handleEvent( @Nonnull String line )
{
- InPluginProcessDumpSingleton.getSingleton()
- .dumpStreamText( line, defaultReporterFactory.getReportsDirectory() );
+ logger.error( line );
}
}