Skip to content

Fixed error on merge #151

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
mangchiandjjoe merged 3 commits into from
Mar 7, 2017
Merged

Fixed error on merge #151

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07b8ff3
Integrated service control client library with quota cache aggregation
mangchiandjjoe Mar 7, 2017
0f2d9a6
Merge pull request #1 from istio/rate_limiting
mangchiandjjoe Mar 7, 2017
5e64be6
Fixed error on merge
mangchiandjjoe Mar 7, 2017
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
19 changes: 4 additions & 15 deletions src/envoy/mixer/http_control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,7 @@ namespace Mixer {
namespace {

// Define attribute names
const std::string kAttrNameRequestSize = "request.size";
const std::string kAttrNameResponseSize = "response.size";
const std::string kAttrNameResponseTime = "response.time";
const std::string kAttrNameOriginIp = "origin.ip";
const std::string kAttrNameOriginHost = "origin.host";
const std::string kResponseHttpCode = "response.http.code";

Attributes::Value StringValue(const std::string& str) {
Attributes::Value v;
v.type = Attributes::Value::STRING;
v.str_v = str;
return v;
}
const std::string kOriginUser = "origin.user";

const std::string kRequestHeaders = "request.headers";
const std::string kRequestHost = "request.host";
Expand Down Expand Up @@ -113,9 +101,10 @@ void FillRequestInfoAttributes(const AccessLog::RequestInfo& info,

if (info.responseCode().valid()) {
attr->attributes[kResponseHttpCode] =
Int64Value(info.responseCode().value());
Attributes::Int64Value(info.responseCode().value());
} else {
attr->attributes[kResponseHttpCode] = Int64Value(check_status_code);
attr->attributes[kResponseHttpCode] =
Attributes::Int64Value(check_status_code);
}
}

Expand Down