[JENKINS-11571] Don't print remote log twice.

jenkinsci · Nov 15, 2011 · 88a3410 · 88a3410
1 parent ccc8720
commit 88a3410
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/tasks/TasksPublisher.java b/src/main/java/hudson/plugins/tasks/TasksPublisher.java
@@ -10,7 +10,6 @@
 import hudson.plugins.analysis.core.BuildResult;
 import hudson.plugins.analysis.core.HealthAwarePublisher;
 import hudson.plugins.analysis.util.PluginLogger;
-import hudson.plugins.analysis.util.StringPluginLogger;
 import hudson.plugins.tasks.parser.TasksParserResult;
 import hudson.plugins.tasks.parser.WorkspaceScanner;
 
@@ -201,8 +200,6 @@ public Action getProjectAction(final AbstractProject<?, ?> project) {
     @Override
     protected BuildResult perform(final AbstractBuild<?, ?> build, final PluginLogger logger) throws InterruptedException, IOException {
         TasksParserResult project;
-        logger.log("Scanning workspace files for tasks...");
-        new StringPluginLogger("");
         WorkspaceScanner scanner = new WorkspaceScanner(StringUtils.defaultIfEmpty(getPattern(), DEFAULT_PATTERN),
                 getExcludePattern(), getDefaultEncoding(), high, normal, low, ignoreCase, shouldDetectModules());
         project = build.getWorkspace().act(scanner);

diff --git a/src/main/java/hudson/plugins/tasks/TasksReporter.java b/src/main/java/hudson/plugins/tasks/TasksReporter.java
@@ -197,15 +197,15 @@ protected boolean acceptGoal(final String goal) {
     @Override
     public TasksParserResult perform(final MavenBuildProxy build, final MavenProject pom, final MojoInfo mojo, final PluginLogger logger) throws InterruptedException, IOException {
         FilePath basedir = new FilePath(pom.getBasedir());
-        logger.log(String.format("Scanning folder '%s' for tasks ... ", basedir));
 
         WorkspaceScanner workspaceScanner = new WorkspaceScanner(
                 StringUtils.defaultIfEmpty(pattern, DEFAULT_PATTERN),
                 excludePattern, getDefaultEncoding(), high, normal, low, ignoreCase, pom.getName(),
                 pom.getModules());
         TasksParserResult project = basedir.act(workspaceScanner);
-        logger.logLines(project.getLogMessages());
-        logger.log(String.format("Found %d open tasks.", project.getNumberOfAnnotations()));
+
+        project.setLog(project.getLogMessages()
+                + String.format("Found %d open tasks.\n", project.getNumberOfAnnotations()));
 
         return project;
     }