Skip to content

Add support for PubSub emulator host variable #1317

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
mziccard merged 1 commit into from
Oct 19, 2016
Merged

Add support for PubSub emulator host variable #1317

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
4 changes: 3 additions & 1 deletion google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class PubSubOptions extends GrpcServiceOptions<PubSub, PubSubRpc, PubSubO
private static final long serialVersionUID = 5640180400046623305L;
private static final String PUBSUB_SCOPE = "https://www.googleapis.com/auth/pubsub";
private static final Set<String> SCOPES = ImmutableSet.of(PUBSUB_SCOPE);
private static final String EMULATOR_HOST_ENV_VAR = "PUBSUB_EMULATOR_HOST";
private static final String DEFAULT_HOST = PublisherSettings.getDefaultServiceAddress()
+ ':' + PublisherSettings.getDefaultServicePort();

Expand Down Expand Up @@ -66,7 +67,8 @@ public PubSubRpc create(PubSubOptions options) {

@Override
protected String defaultHost() {
return DEFAULT_HOST;
String host = System.getProperty(EMULATOR_HOST_ENV_VAR, System.getenv(EMULATOR_HOST_ENV_VAR));
return host != null ? host : DEFAULT_HOST;
}

public static class Builder extends
Expand Down