Skip to content

Add a getTimeout method to get the functions timeout. #574

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
bklimt merged 3 commits into from
Jul 3, 2019
Merged

Add a getTimeout method to get the functions timeout. #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f4ed6e
Add a getTimeout accessor.
bklimt Jun 27, 2019
1139213
Add a getTimeout accessor.
bklimt Jun 27, 2019
9a9ed22
Merge branch 'master' into klimt.getTimeout
bklimt Jun 27, 2019
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 firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ public void testTimeout() {

HttpsCallableReference function =
functions.getHttpsCallable("timeoutTest").withTimeout(10, TimeUnit.MILLISECONDS);
assertEquals(10, function.getTimeout());
Task<HttpsCallableResult> result = function.call();
ExecutionException exe = assertThrows(ExecutionException.class, () -> Tasks.await(result));
Throwable cause = exe.getCause();
Expand Down
9 changes: 9 additions & 0 deletions firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ void setTimeout(long timeout, TimeUnit units) {
this.timeoutUnits = units;
}

/**
* Returns the timeout for calls from this instance of Functions.
*
* @return The timeout, in milliseconds.
*/
public long getTimeout() {
return timeoutUnits.toMillis(timeout);
}

/** Creates a new OkHttpClient with these options applied to it. */
OkHttpClient apply(OkHttpClient client) {
return client.newBuilder().callTimeout(timeout, timeoutUnits).build();
Expand Down
9 changes: 9 additions & 0 deletions firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@ public void setTimeout(long timeout, @NonNull TimeUnit units) {
}

@NonNull
/**
* Returns the timeout for calls from this instance of Functions.
*
* @return The timeout, in milliseconds.
*/
public long getTimeout() {
return options.getTimeout();
}

/**
* Creates a new reference with the given timeout for calls. The default is 60 seconds.
*
Expand Down