Skip to content

Fix log_prefix initialization. #124

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
mathetake merged 2 commits into from
Jan 12, 2021
Merged

Fix log_prefix initialization. #124

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
b106dba
Fix log_prefix initialization.
mathetake Jan 12, 2021
be9123c
Merge branch 'master' into fixlog-prefix
mathetake Jan 12, 2021
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 include/proxy-wasm/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ struct PluginBase {
std::string_view runtime, std::string_view plugin_configuration, bool fail_open)
: name_(std::string(name)), root_id_(std::string(root_id)), vm_id_(std::string(vm_id)),
runtime_(std::string(runtime)), plugin_configuration_(plugin_configuration),
fail_open_(fail_open), key_(root_id_ + "||" + plugin_configuration_) {}
fail_open_(fail_open), key_(root_id_ + "||" + plugin_configuration_),
log_prefix_(makeLogPrefix()) {}

const std::string name_;
const std::string root_id_;
Expand Down
4 changes: 2 additions & 2 deletions src/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ std::string PluginBase::makeLogPrefix() const {
if (!root_id_.empty()) {
prefix = prefix + " " + std::string(root_id_);
}
if (vm_id_.empty()) {
if (!vm_id_.empty()) {
prefix = prefix + " " + std::string(vm_id_);
}
return prefix;
Expand Down Expand Up @@ -134,7 +134,7 @@ std::string ContextBase::makeRootLogPrefix(std::string_view vm_id) const {
if (!root_id_.empty()) {
prefix = prefix + " " + std::string(root_id_);
}
if (vm_id.empty()) {
if (!vm_id.empty()) {
prefix = prefix + " " + std::string(vm_id);
}
return prefix;
Expand Down