Skip to content

chore: enhance naming of bool maybeSendErrorReply #568

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
mum4k merged 1 commit into from
Nov 11, 2020
Merged

chore: enhance naming of bool maybeSendErrorReply #568

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
4 changes: 2 additions & 2 deletions source/server/http_dynamic_delay_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ HttpDynamicDelayDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& head
maybeRequestFaultFilterDelay(delay_ms, headers);
} else {
if (end_stream) {
config_->maybeSendErrorReply(*decoder_callbacks_);
config_->validateOrSendError(*decoder_callbacks_);
return Envoy::Http::FilterHeadersStatus::StopIteration;
}
return Envoy::Http::FilterHeadersStatus::Continue;
Expand All @@ -59,7 +59,7 @@ Envoy::Http::FilterDataStatus
HttpDynamicDelayDecoderFilter::decodeData(Envoy::Buffer::Instance& buffer, bool end_stream) {
if (!config_->getEffectiveConfiguration().ok()) {
if (end_stream) {
config_->maybeSendErrorReply(*decoder_callbacks_);
config_->validateOrSendError(*decoder_callbacks_);
return Envoy::Http::FilterDataStatus::StopIterationNoBuffer;
}
return Envoy::Http::FilterDataStatus::Continue;
Expand Down
2 changes: 1 addition & 1 deletion source/server/http_filter_config_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void FilterConfigurationBase::computeEffectiveConfiguration(
}
}

bool FilterConfigurationBase::maybeSendErrorReply(
bool FilterConfigurationBase::validateOrSendError(
Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const {
if (!effective_config_.ok()) {
decoder_callbacks.sendLocalReply(static_cast<Envoy::Http::Code>(500),
Expand Down
2 changes: 1 addition & 1 deletion source/server/http_filter_config_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class FilterConfigurationBase {
* @param decoder_callbacks Decoder used to generate the reply.
* @return true iff an error reply was generated.
*/
bool maybeSendErrorReply(Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const;
bool validateOrSendError(Envoy::Http::StreamDecoderFilterCallbacks& decoder_callbacks) const;

/**
* @brief Get the effective configuration. Depending on state ,this could be one of static
Expand Down
4 changes: 2 additions & 2 deletions source/server/http_test_server_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ HttpTestServerDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& header
bool end_stream) {
config_->computeEffectiveConfiguration(headers);
if (end_stream) {
if (!config_->maybeSendErrorReply(*decoder_callbacks_)) {
if (!config_->validateOrSendError(*decoder_callbacks_)) {
const absl::StatusOr<EffectiveFilterConfigurationPtr> effective_config =
config_->getEffectiveConfiguration();
if (effective_config.value()->echo_request_headers()) {
Expand All @@ -57,7 +57,7 @@ HttpTestServerDecoderFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& header
Envoy::Http::FilterDataStatus HttpTestServerDecoderFilter::decodeData(Envoy::Buffer::Instance&,
bool end_stream) {
if (end_stream) {
if (!config_->maybeSendErrorReply(*decoder_callbacks_)) {
if (!config_->validateOrSendError(*decoder_callbacks_)) {
sendReply(*config_->getEffectiveConfiguration().value());
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/server/http_time_tracking_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ HttpTimeTrackingFilter::HttpTimeTrackingFilter(HttpTimeTrackingFilterConfigShare
Envoy::Http::FilterHeadersStatus
HttpTimeTrackingFilter::decodeHeaders(Envoy::Http::RequestHeaderMap& headers, bool end_stream) {
config_->computeEffectiveConfiguration(headers);
if (end_stream && config_->maybeSendErrorReply(*decoder_callbacks_)) {
if (end_stream && config_->validateOrSendError(*decoder_callbacks_)) {
return Envoy::Http::FilterHeadersStatus::StopIteration;
}
return Envoy::Http::FilterHeadersStatus::Continue;
}

Envoy::Http::FilterDataStatus HttpTimeTrackingFilter::decodeData(Envoy::Buffer::Instance&,
bool end_stream) {
if (end_stream && config_->maybeSendErrorReply(*decoder_callbacks_)) {
if (end_stream && config_->validateOrSendError(*decoder_callbacks_)) {
return Envoy::Http::FilterDataStatus::StopIterationNoBuffer;
}
return Envoy::Http::FilterDataStatus::Continue;
Expand Down