Skip to content

Forward errors from gcd.sh #250

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

Merged
merged 11 commits into from
Oct 16, 2015
Merged

Forward errors from gcd.sh #250

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33ddb90
Split normal and error output streams in ProcessStreamReader to forwa…
Oct 13, 2015
235da5a
Log gcd.sh errors instead of printing to stderr
Oct 13, 2015
39e3d3a
Make two threads to digest gcd.sh output
Oct 15, 2015
6e66dfd
fix merge conflict
Oct 15, 2015
007a9ab
simplify logging logic
Oct 16, 2015
4e7aa3a
try continue to consuming output in the event of exception
Oct 16, 2015
8e595a7
avoid duplicating last log on terminate
Oct 16, 2015
5029f00
use StringBuilder for accumulating logs
Oct 16, 2015
054ed10
ensure last line of logs is output
Oct 16, 2015
c993853
remove check for duplicate logs
Oct 16, 2015
291486d
style fix
Oct 16, 2015
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
57 changes: 49 additions & 8 deletions gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,23 @@ private static class ProcessStreamReader extends Thread {

private final Process process;
private final BufferedReader reader;
private final BufferedReader errorReader;

ProcessStreamReader(Process process, String blockUntil) throws IOException {
ProcessStreamReader(
Process process, String blockUntil, boolean blockOnErrorStream) throws IOException {
super("Local GCD InputStream reader");
setDaemon(true);
this.process = process;
reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
if (!Strings.isNullOrEmpty(blockUntil)) {
String line;
do {
line = reader.readLine();
if (blockOnErrorStream) {
line = errorReader.readLine();
} else {
line = reader.readLine();
}
} while (line != null && !line.contains(blockUntil));
}
}
Expand All @@ -205,16 +212,51 @@ void terminate() throws InterruptedException, IOException {
@Override
public void run() {
try {
while (reader.readLine() != null) {
// consume line
boolean readerDone = false;
boolean errorReaderDone = false;
String currentLog = null;
while (!readerDone || !errorReaderDone) {
if (!readerDone && reader.ready()) {
readerDone = reader.readLine() == null;
}
if (!errorReaderDone && errorReader.ready()) {
String errorOutput = errorReader.readLine();
if (errorOutput == null) {
errorReaderDone = true;
} else {
currentLog = processLog(errorOutput, currentLog);
}
}
}
} catch (IOException e) {
// ignore
}
}

public static ProcessStreamReader start(Process process, String blockUntil) throws IOException {
ProcessStreamReader thread = new ProcessStreamReader(process, blockUntil);
private static boolean isNewGcdLog(String line) {
return line.contains("com.google.apphosting.client.serviceapp.BaseApiServlet")
&& !line.trim().startsWith("at ");
}

private static String processLog(String currentLine, String currentLog) {
if (isNewGcdLog(currentLine)) {
if (currentLog != null) {
log.info(currentLog.trim());
}
return "GCD ";
} else if (currentLine.startsWith("SEVERE: ")) {
return null; // Don't show duplicate error messages from gcd.sh

This comment was marked as spam.

Sign in to view

} else if (currentLog != null && currentLine.startsWith("INFO: ")) {
return currentLog + currentLine.substring("INFO: ".length()) + "\n";
} else if (currentLog != null && !currentLine.trim().startsWith("at ")) {
return currentLog + currentLine + "\n";
}
return currentLog;
}

public static ProcessStreamReader start(
Process process, String blockUntil, boolean blockOnErrorStream) throws IOException {
ProcessStreamReader thread = new ProcessStreamReader(process, blockUntil, blockOnErrorStream);
thread.start();
return thread;
}
Expand Down Expand Up @@ -396,9 +438,8 @@ private void startGcd(Path executablePath) throws IOException, InterruptedExcept
.command(gcdAbsolutePath.toString(), "start", "--testing", "--allow_remote_shutdown",
"--port=" + Integer.toString(port), projectId)
.directory(gcdPath)
.redirectErrorStream()
.start();
processReader = ProcessStreamReader.start(startProcess, "Dev App Server is now running");
processReader = ProcessStreamReader.start(startProcess, "Dev App Server is now running", true);

This comment was marked as spam.

Sign in to view

}

private static String md5(File gcdZipFile) throws IOException {
Expand Down