Skip to content

Fix brittle code related to launching a Bazel process #448

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 1 commit into from
May 10, 2022
Merged

Fix brittle code related to launching a Bazel process #448

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
1 change: 1 addition & 0 deletions examples/bazel-example/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bazel-bazel-example
14 changes: 6 additions & 8 deletions lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/BazelBuildTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

public class BazelBuildTool {

public static int runAndReturnExitCode(String[] args) throws IOException {
public static int runAndReturnExitCode(String[] args) throws IOException, InterruptedException {
Optional<BazelOptions> maybeOptions = BazelOptions.parse(args);
if (!maybeOptions.isPresent()) {
return 1;
Expand Down Expand Up @@ -56,7 +56,8 @@ public void error(Throwable e) {
return 0;
}

public static List<MavenPackage> mavenPackages(BazelOptions options) throws IOException {
public static List<MavenPackage> mavenPackages(BazelOptions options)
throws IOException, InterruptedException {
ArrayList<MavenPackage> result = new ArrayList<>();
if (!options.isQueryMavenImports) {
return result;
Expand Down Expand Up @@ -109,22 +110,19 @@ public static List<MavenPackage> mavenPackages(BazelOptions options) throws IOEx
}

public static Bazelbuild.QueryResult runBazelQuery(BazelOptions options, String query)
throws IOException {
throws IOException, InterruptedException {
List<String> command = Arrays.asList(options.bazelBinary, "query", query, "--output=proto");
System.out.println("running: " + String.join(" ", command));
Process bazelQuery = new ProcessBuilder(command).directory(options.sourceroot.toFile()).start();
byte[] bytes = InputStreamBytes.readAll(bazelQuery.getInputStream());
if (bazelQuery.isAlive()) {
throw new RuntimeException(new String(InputStreamBytes.readAll(bazelQuery.getErrorStream())));
}
int exitValue = bazelQuery.exitValue();
int exitValue = bazelQuery.waitFor();
if (exitValue != 0) {
throw new RuntimeException("bazel command failed\n" + new String(bytes));
}
return Bazelbuild.QueryResult.parseFrom(bytes);
}

public static void main(String[] args) throws IOException {
public static void main(String[] args) throws IOException, InterruptedException {
System.exit(runAndReturnExitCode(args));
}
}