stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8230652: Improve verbose output

Browse Source 
Reviewed-by: almatvee, asemenyuk, kizune
This commit is contained in:
Andy Herrick 2020-09-21 13:08:19 +00:00
parent 5a7390b62a
commit 43be5a3cb6
9 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java
View File

@ -187,7 +187,6 @@ public abstract class MacBaseInstallerBundler extends AbstractBundler {
Log.error(MessageFormat.format(I18N.getString(
"error.multiple.certs.found"), key, keychainName));
}
Log.verbose("Using key '" + matchedKey + "'");
return matchedKey;
} catch (IOException ioe) {
Log.verbose(ioe);

3
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java
View File

@ -82,9 +82,6 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
if (appLocation != null && prepareConfigFiles(params)) {
Path configScript = getConfig_Script(params);
if (IOUtils.exists(configScript)) {
Log.verbose(MessageFormat.format(
I18N.getString("message.running-script"),
configScript.toAbsolutePath().toString()));
IOUtils.run("bash", configScript);
}

3
src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java
View File

@ -142,9 +142,6 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
Path configScript = getConfig_Script(params);
if (IOUtils.exists(configScript)) {
Log.verbose(MessageFormat.format(I18N.getString(
"message.running-script"),
configScript.toAbsolutePath().toString()));
IOUtils.run("bash", configScript);
}

41
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java
View File

@ -75,6 +75,11 @@ final public class Executor {
return setProcessBuilder(new ProcessBuilder(cmdline));
}
Executor setQuiet(boolean v) {
quietCommand = v;
return this;
}
List<String> getOutput() {
return output;
}
@ -84,7 +89,7 @@ final public class Executor {
if (0 != ret) {
throw new IOException(
String.format("Command %s exited with %d code",
createLogMessage(pb), ret));
createLogMessage(pb, false), ret));
}
return this;
}
@ -108,7 +113,7 @@ final public class Executor {
pb.redirectOutput(ProcessBuilder.Redirect.DISCARD);
}
Log.verbose(String.format("Running %s", createLogMessage(pb)));
Log.verbose(String.format("Running %s", createLogMessage(pb, true)));
Process p = pb.start();
int code = 0;
@ -126,7 +131,7 @@ final public class Executor {
Supplier<Stream<String>> outputStream;
if (writeOutputToFile) {
savedOutput = Files.readAllLines(outputFile);
output = savedOutput = Files.readAllLines(outputFile);
Files.delete(outputFile);
outputStream = () -> {
if (savedOutput != null) {
@ -134,27 +139,20 @@ final public class Executor {
}
return null;
};
if (Log.isVerbose()) {
outputStream.get().forEach(Log::verbose);
}
if (outputConsumer != null) {
outputConsumer.accept(outputStream.get());
}
} else {
try (var br = new BufferedReader(new InputStreamReader(
p.getInputStream()))) {
// Need to save output if explicitely requested (saveOutput=true) or
// if will be used used by multiple consumers
if ((outputConsumer != null && Log.isVerbose()) || saveOutput) {
if ((outputConsumer != null || Log.isVerbose())
|| saveOutput) {
savedOutput = br.lines().collect(Collectors.toList());
if (saveOutput) {
output = savedOutput;
}
} else {
savedOutput = null;
}
output = savedOutput;
outputStream = () -> {
if (savedOutput != null) {
@ -162,11 +160,6 @@ final public class Executor {
}
return br.lines();
};
if (Log.isVerbose()) {
outputStream.get().forEach(Log::verbose);
}
if (outputConsumer != null) {
outputConsumer.accept(outputStream.get());
}
@ -188,6 +181,9 @@ final public class Executor {
if (!writeOutputToFile) {
code = p.waitFor();
}
if (!quietCommand) {
Log.verbose(pb.command(), getOutput(), code);
}
return code;
} catch (InterruptedException ex) {
Log.verbose(ex);
@ -203,7 +199,7 @@ final public class Executor {
return p.exitValue();
} else {
Log.verbose(String.format("Command %s timeout after %d seconds",
createLogMessage(pb), timeout));
createLogMessage(pb, false), timeout));
p.destroy();
return -1;
}
@ -218,9 +214,9 @@ final public class Executor {
return new Executor().setProcessBuilder(pb);
}
private static String createLogMessage(ProcessBuilder pb) {
private static String createLogMessage(ProcessBuilder pb, boolean quiet) {
StringBuilder sb = new StringBuilder();
sb.append(String.format("%s", pb.command()));
sb.append((quiet) ? pb.command().get(0) : pb.command());
if (pb.directory() != null) {
sb.append(String.format("in %s", pb.directory().getAbsolutePath()));
}
@ -232,6 +228,7 @@ final public class Executor {
private ProcessBuilder pb;
private boolean saveOutput;
private boolean writeOutputToFile;
private boolean quietCommand;
private long timeout = INFINITE_TIMEOUT;
private List<String> output;
private Consumer<Stream<String>> outputConsumer;

1
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java
View File

@ -228,6 +228,7 @@ public class IOUtils {
t.start();
int ret = p.waitFor();
Log.verbose(pb.command(), list, ret);
result.clear();
result.addAll(list);

7
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java
View File

@ -188,15 +188,16 @@ final class JLinkBundlerHelper {
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
Log.verbose("jlink arguments: " + args);
int retVal = LazyLoad.JLINK_TOOL.run(pw, pw, args.toArray(new String[0]));
String jlinkOut = writer.toString();
args.add(0, "jlink");
Log.verbose(args, List.of(jlinkOut), retVal);
if (retVal != 0) {
throw new PackagerException("error.jlink.failed" , jlinkOut);
}
Log.verbose("jlink output: " + jlinkOut);
}
private static String getPathList(List<Path> pathList) {

27
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java
View File

@ -28,6 +28,7 @@ package jdk.incubator.jpackage.internal;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* Log
@ -115,6 +116,25 @@ public class Log {
}
}
public void verbose(List<String> strings,
List<String> output, int returnCode) {
if (verbose) {
StringBuffer sb = new StringBuffer("Command:\n ");
for (String s : strings) {
sb.append(" " + s);
}
verbose(new String(sb));
if (output != null && !output.isEmpty()) {
sb = new StringBuffer("Output:");
for (String s : output) {
sb.append("\n " + s);
}
verbose(new String(sb));
}
verbose("Returned: " + returnCode + "\n");
}
}
private String addTimestamp(String msg) {
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
Date time = new Date(System.currentTimeMillis());
@ -173,4 +193,11 @@ public class Log {
delegate.verbose(t);
}
}
public static void verbose(List<String> strings, List<String> out, int ret) {
if (delegate != null) {
delegate.verbose(strings, out, ret);
}
}
}

2
src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java
View File

@ -94,7 +94,7 @@ public final class ToolValidator {
}
String[] version = new String[1];
Executor.of(pb).setOutputConsumer(lines -> {
Executor.of(pb).setQuiet(true).setOutputConsumer(lines -> {
if (versionParser != null && minimalVersion != null) {
version[0] = versionParser.apply(lines);
if (minimalVersion.compareTo(version[0]) < 0) {

4
test/jdk/tools/jpackage/windows/WinL10nTest.java
View File

@ -95,9 +95,7 @@ public class WinL10nTest {
private final static Stream<String> getLightCommandLine(
Executor.Result result) {
return result.getOutput().stream()
.filter(s -> s.contains("Running"))
.filter(s -> s.contains("light.exe"))
.filter(s -> !s.contains("/?"));
.filter(s -> s.trim().startsWith("light.exe"));
}
@Test