Skip to content

Fix null logger in remote #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
torutk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix null logger in remote #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/org/jenkinsci/plugins/stepcounter/StepCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public boolean perform(Run<?, ?> run, Launcher launcher, FilePath workspace, Tas
projectAction.setResult(resultAction);
boolean result = false;
try {
result = _perform(resultAction, workspace, vars, listener.getLogger());
result = _perform(resultAction, workspace, vars, listener);
} catch (IOException e) {
run.setResult(Result.FAILURE);
listener.error(e.getMessage());
Expand All @@ -115,7 +115,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
try {
EnvVars vars = build.getEnvironment(listener);
FilePath workspace = build.getWorkspace();
result = _perform(resultAction, workspace, vars, listener.getLogger());
result = _perform(resultAction, workspace, vars, listener);
} catch (IOException e) {
build.setResult(Result.FAILURE);
listener.error(e.getMessage());
Expand All @@ -126,14 +126,14 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
return result;
}

public boolean _perform(StepCounterResultAction resultAction, FilePath workspace, EnvVars vars, PrintStream logger)
public boolean _perform(StepCounterResultAction resultAction, FilePath workspace, EnvVars vars, TaskListener listener)
throws IOException, InterruptedException {

List<StepCounterParser> parsers = new ArrayList<StepCounterParser>();
if (getSettings() == null) {
return false;
}

PrintStream logger = listener.getLogger();
for (StepCounterSetting setting : getSettings()) {
String encoding = vars.expand(setting.getEncoding());
String category = vars.expand(setting.getKey());
Expand All @@ -143,7 +143,7 @@ public boolean _perform(StepCounterResultAction resultAction, FilePath workspace
logger.println("[stepcounter] includes [" + includes + "]");
logger.println("[stepcounter] excludes [" + excludes + "]");
logger.println("[stepcounter] encoding [" + encoding + "]");
StepCounterParser finder = new StepCounterParser(includes, excludes, encoding, logger, category,
StepCounterParser finder = new StepCounterParser(includes, excludes, encoding, listener, category,
DESCRIPTOR.getCountFormats());
StepCounterResult result = workspace.act(finder);
resultAction.putStepsMap(category, result);
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/org/jenkinsci/plugins/stepcounter/parser/StepCounterParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.jenkinsci.remoting.RoleChecker;

import hudson.FilePath.FileCallable;
import hudson.model.TaskListener;
import hudson.remoting.VirtualChannel;
import jp.sf.amateras.stepcounter.CountResult;
import jp.sf.amateras.stepcounter.StepCounter;
Expand All @@ -29,7 +30,7 @@ public class StepCounterParser implements FileCallable<StepCounterResult> {

private String encoding;

transient private PrintStream logger;
private TaskListener listener;

private List<OriginalCountResult> _results = new ArrayList<OriginalCountResult>();

Expand All @@ -38,11 +39,11 @@ public class StepCounterParser implements FileCallable<StepCounterResult> {
private List<StepCounterParserSetting> setting;

public StepCounterParser(final String filePattern, final String filePatternExclude, final String encoding,
final PrintStream logger, String category, List<StepCounterParserSetting> setting) {
final TaskListener listener, String category, List<StepCounterParserSetting> setting) {
this.filePattern = filePattern;
this.filePatternExclude = filePatternExclude;
this.encoding = encoding;
this.logger = logger;
this.listener = listener;
this.category = category;
this.setting = setting;
}
Expand All @@ -53,27 +54,27 @@ public StepCounterResult invoke(final File workspace, final VirtualChannel chann
String[] fileNames = new FileFinder(filePattern, filePatternExclude).find(workspace);

if (fileNames.length == 0) {
logger.println("[stepcounter] " + Messages.filenotfound());
listener.getLogger().println("[stepcounter] " + Messages.filenotfound());
} else {
logger.println(
listener.getLogger().println(
"[stepcounter] Parsing " + fileNames.length + " files in " + workspace.getAbsolutePath());
parseFiles(workspace, fileNames, result);
}
} catch (InterruptedException exception) {
logger.println("Parsing has been canceled.");
listener.getLogger().println("Parsing has been canceled.");
} catch (RuntimeException e) {
e.printStackTrace();
throw e;
}

logger.println("[stepcounter] Parse completed:" + result.getFileSteps().size() + " files");
listener.getLogger().println("[stepcounter] Parse completed:" + result.getFileSteps().size() + " files");

long total = 0;
for (Object oStep : result.getFileSteps()) {
FileStep step = (FileStep) oStep;
total += step.getRuns();
}
logger.println("[stepcounter] total[" + total + "]");
listener.getLogger().println("[stepcounter] total[" + total + "]");

return result;
}
Expand Down Expand Up @@ -113,7 +114,7 @@ private void parseFiles(final File workspace, final String[] fileNames, final St
}

private void parseFile(final File file, final StepCounterResult result, final String rootPath) throws IOException {
logger.println("[stepcounter] " + file.getAbsolutePath());
listener.getLogger().println("[stepcounter] " + file.getAbsolutePath());
StepCounter counter = OriginalStepCounterFactory.getCounter(file, this.setting);
if (counter != null) {

Expand All @@ -129,7 +130,7 @@ private void parseFile(final File file, final StepCounterResult result, final St
OriginalCountResult originalCountResult = new OriginalCountResult(countResult, relativePath);
_results.add(originalCountResult);
} else {
logger.println("[stepcounter] no applicable file type [" + file.getName() + "]");
listener.getLogger().println("[stepcounter] no applicable file type [" + file.getName() + "]");
}
}

Expand Down