Skip to content

Fix weird protobuf string issue with ternary operator. #2653

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
htuch merged 1 commit into from
Feb 21, 2018
Merged

Fix weird protobuf string issue with ternary operator. #2653

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
3 changes: 2 additions & 1 deletion source/common/upstream/upstream_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ ClusterInfoImpl::ClusterInfoImpl(const envoy::api::v2::Cluster& config,
per_connection_buffer_limit_bytes_(
PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, per_connection_buffer_limit_bytes, 1024 * 1024)),
stats_scope_(stats.createScope(fmt::format(
"cluster.{}.", config.alt_stat_name().empty() ? name_ : config.alt_stat_name()))),
"cluster.{}.",
config.alt_stat_name().empty() ? name_ : std::string(config.alt_stat_name())))),
stats_(generateStats(*stats_scope_)),
load_report_stats_(generateLoadReportStats(load_report_stats_store_)),
features_(parseFeatures(config)),
Expand Down
2 changes: 1 addition & 1 deletion source/common/upstream/upstream_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class ClusterInfoImpl : public ClusterInfo,
static uint64_t parseFeatures(const envoy::api::v2::Cluster& config);

Runtime::Loader& runtime_;
const Envoy::ProtobufTypes::String name_;
const std::string name_;
const envoy::api::v2::Cluster::DiscoveryType type_;
const uint64_t max_requests_per_connection_;
const std::chrono::milliseconds connect_timeout_;
Expand Down