Skip to content

Handlers can be async #68

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

Closed
wants to merge 12 commits into from
+335 −237
Closed

Handlers can be async #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f7eb74
RuntimeClient::next_event returns a Future
illicitonion Jan 5, 2019
a5072a0
RuntimeClient::event_response returns a Future
illicitonion Jan 5, 2019
4301ffd
RuntimeClient::event_error returns Future
illicitonion Jan 5, 2019
5adedef
Drive execution from a tokio Runtime
illicitonion Jan 5, 2019
695333c
get_next_event uses a future loop_fn
illicitonion Jan 5, 2019
e96a013
Runtime::start is fully async
illicitonion Jan 6, 2019
c65d0e5
Handler returns IntoFuture not Result
illicitonion Jan 6, 2019
2f6e599
Add contrived async Handler example
illicitonion Jan 6, 2019
3aa5a85
Update README
illicitonion Jan 6, 2019
f2ae75f
cargo fmt
illicitonion Jan 6, 2019
0f253c6
cargo fmt with nightly
illicitonion Jan 6, 2019
5d1de6d
Review comments
illicitonion Jan 13, 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
Prev Previous commit
Next Next commit
RuntimeClient::event_error returns Future
  • Loading branch information
@illicitonion
illicitonion committed Jan 6, 2019
commit 4301ffd2b115031aa04d88369af8c2eb3214fbb2
42 changes: 24 additions & 18 deletions lambda-runtime-client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,41 +258,47 @@ impl RuntimeClient {
/// object.
///
/// # Returns
/// A `Result` object containing a bool return value for the call or an `error::ApiError` instance.
pub fn event_error(&self, request_id: &str, e: &dyn RuntimeApiError) -> Result<(), ApiError> {
let uri: Uri = format!(
/// A `Future` object containing a either resolving () for success or an `error::ApiError` instance.
pub fn event_error(&self, request_id: String, e: &dyn RuntimeApiError) -> impl Future<Item=(), Error=ApiError> {
let uri = format!(
"http://{}/{}/runtime/invocation/{}/error",
self.endpoint, RUNTIME_API_VERSION, request_id
)
.parse()?;
trace!(
"Posting error to runtime API for request {}: {}",
request_id,
e.to_response().error_message
);
let req = self.get_runtime_error_request(&uri, &e.to_response());

match self.http_client.request(req).wait() {
.parse();
let http_client = self.http_client.clone();
let response = e.to_response();
let request_id2 = request_id.clone();
uri.into_future()
.map_err(ApiError::from)
.map(move |uri| (Self::get_runtime_error_request(&uri, &response), response))
.and_then(move |(req, error_response)| {
trace!(
"Posting error to runtime API for request {}: {}",
request_id,
error_response.error_message
);
http_client.request(req).map_err(ApiError::from)
}).then(move |result| match result {
Ok(resp) => {
if !resp.status().is_success() {
error!(
"Error from Runtime API when posting error response for request {}: {}",
request_id,
request_id2,
resp.status()
);
return Err(ApiError::new(&format!(
"Error {} while sending response",
resp.status()
)));
}
trace!("Posted error response for request id {}", request_id);
trace!("Posted error response for request id {}", request_id2);
Ok(())
}
Err(e) => {
error!("Error when calling runtime API for request {}: {}", request_id, e);
error!("Error when calling runtime API for request {}: {}", request_id2, e);
Err(ApiError::from(e))
}
}
})
}

/// Calls the Runtime APIs to report a failure during the init process.
Expand All @@ -311,7 +317,7 @@ impl RuntimeClient {
.parse()
.expect("Could not generate Runtime URI");
error!("Calling fail_init Runtime API: {}", e.to_response().error_message);
let req = self.get_runtime_error_request(&uri, &e.to_response());
let req = Self::get_runtime_error_request(&uri, &e.to_response());

self.http_client
.request(req)
Expand Down Expand Up @@ -352,7 +358,7 @@ impl RuntimeClient {
.unwrap()
}

fn get_runtime_error_request(&self, uri: &Uri, e: &ErrorResponse) -> Request<Body> {
fn get_runtime_error_request(uri: &Uri, e: &ErrorResponse) -> Request<Body> {
let body = serde_json::to_vec(e).expect("Could not turn error object into response JSON");
Request::builder()
.method(Method::POST)
Expand Down
4 changes: 2 additions & 2 deletions lambda-runtime/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ where
Err(e) => {
debug!("Handler returned an error for {}: {}", request_id, e);
debug!("Attempting to send error response to Runtime API for {}", request_id);
match self.runtime_client.event_error(&request_id, &e) {
match self.runtime_client.event_error(request_id.clone(), &e).wait() {
Ok(_) => info!("Error response for {} accepted by Runtime API", request_id),
Err(e) => {
error!("Unable to send error response for {} to Runtime API: {}", request_id, e);
Expand Down Expand Up @@ -281,7 +281,7 @@ where
match err.request_id.clone() {
Some(req_id) => {
self.runtime_client
.event_error(&req_id, &err)
.event_error(req_id, &err).wait()
.expect("Could not send event error response");
}
None => {
Expand Down