Skip to content

Be nice to more standard http servers. #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 2 commits into from
Mar 17, 2022
Merged

Be nice to more standard http servers. #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0376f59
Be nice to more standard http servers.
calavera Mar 17, 2022
78eeb5c
Enable http niciness only when binaries are compiled in debug mode.
calavera Mar 17, 2022
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
2 changes: 1 addition & 1 deletion lambda-http/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn into_api_gateway_v2_request(ag: ApiGatewayV2httpRequest) -> http::Request<Bod
.headers
.get(http::header::HOST)
.and_then(|s| s.to_str().ok())
.or_else(|| ag.request_context.domain_name.as_deref())
.or(ag.request_context.domain_name.as_deref())
.unwrap_or_default();

let path = apigw_path_with_stage(&ag.request_context.stage, ag.raw_path.as_deref().unwrap_or_default());
Expand Down
23 changes: 19 additions & 4 deletions lambda-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,30 @@ where
{
let client = &self.client;
tokio::pin!(incoming);
while let Some(event) = incoming.next().await {
while let Some(next_event_response) = incoming.next().await {
trace!("New event arrived (run loop)");
let event = event?;
let event = next_event_response?;
let (parts, body) = event.into_parts();

#[cfg(debug_assertions)]
if parts.status == http::StatusCode::NO_CONTENT {
Copy link
Contributor

@rimutaka rimutaka Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can an AWS server return this status? If not, should this be under an optional flag or for debug only?

Copy link
Contributor Author

@calavera calavera Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why should we complicate it more than this?

// Ignore the event if the status code is 204.
// This is a way to keep the runtime alive when
// there are no events pending to be processed.
continue;
}

let body = hyper::body::to_bytes(body).await?;
trace!("response body - {}", std::str::from_utf8(&body)?);

#[cfg(debug_assertions)]
if parts.status.is_server_error() {
error!("Lambda Runtime server returned an unexpected error");
return Err(parts.status.to_string().into());
}

let ctx: Context = Context::try_from(parts.headers)?;
let ctx: Context = ctx.with_config(config);
let body = hyper::body::to_bytes(body).await?;
trace!("{}", std::str::from_utf8(&body)?); // this may be very verbose
let body = serde_json::from_slice(&body)?;

let xray_trace_id = &ctx.xray_trace_id.clone();
Expand Down