Skip to content

Http application layer fixes #54

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

Open
wsourdeau wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Http application layer fixes #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ab1847
rtbkit_integration_test: make use of a configurable number of agents
Jul 11, 2014
ec23bde
"toPopupTransfer" -> "topupTransfer" and reworked indentation
Jul 14, 2014
3e38a99
rtbkit_integration_test: cleanup of the code handling multiple agents…
Jul 14, 2014
679bf80
rtbkit_integration_test: improved support for HTTP application layer
Jul 14, 2014
7de2431
slave banker: added some metrics for the account sync
Jul 14, 2014
9aa0398
Merge branch 'master' into http-application-layer-fixes
Jul 15, 2014
e6686ae
slave_banker: removed comments
Jul 15, 2014
a51e955
rtbkit_integration_test: use static_pointer_cast<T> when casting a Ba…
Jul 15, 2014
d22f03c
rtbkit_integration_test: use ZMQ_APP_LAYER, since it fits the first s…
Jul 15, 2014
e343c8f
rtbkit_integration_test: reduced number of accounts to 50, to lower p…
Jul 15, 2014
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 rtbkit/core/banker/account.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,15 +1194,15 @@ struct Accounts {
{
auto it = accounts.find(account);
if (it == accounts.end())
throw ML::Exception("couldn't get account");
throw ML::Exception("couldn't get account: " + account.toString());
return it->second;
}

const AccountInfo & getAccountImpl(const AccountKey & account) const
{
auto it = accounts.find(account);
if (it == accounts.end())
throw ML::Exception("couldn't get account");
throw ML::Exception("couldn't get account: " + account.toString());
return it->second;
}

Expand Down
148 changes: 72 additions & 76 deletions rtbkit/core/banker/application_layer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@ namespace RTBKIT {
template<typename Result>
std::shared_ptr<HttpClientSimpleCallbacks>
makeCallback(std::string functionName,
std::function<void (std::exception_ptr, Result &&)> onDone)
std::function<void (std::exception_ptr, Result &&)> onDone)
{
//static_assert(std::is_default_constructible<Result>::value,
// "Result is not default constructible");

return std::make_shared<HttpClientSimpleCallbacks>(
[=](const HttpRequest &,
HttpClientError error, int statusCode,
std::string &&, std::string &&body)
{
std::string &&, std::string &&body) {
JML_TRACE_EXCEPTIONS(false);
if (!onDone) {
return;
Expand All @@ -38,19 +37,19 @@ makeCallback(std::string functionName,
Result { });
}
else {
decodeRestResponseJson<Result>(functionName, nullptr, statusCode, body, onDone);
decodeRestResponseJson<Result>(functionName, nullptr, statusCode, body, onDone);
}
});
}

void
ApplicationLayer::
toPopupTransfer(const AccountKey &account,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
topupTransfer(const AccountKey &account,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
{
toPopupTransfer(account.toString(), accountType, amount, onResult);
topupTransfer(account.toString(), accountType, amount, onResult);
}

void
Expand All @@ -75,18 +74,18 @@ addAccount(const AccountKey &account,
const BudgetController::OnBudgetResult &onResult)
{
httpClient->post("/v1/accounts", budgetResultCallback(onResult),
{ },
{ { "accountName", account.toString() },
{ "accountType", "budget" }});
{ },
{ { "accountName", account.toString() },
{ "accountType", "budget" }});
}


void
HttpLayer::
toPopupTransfer(const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
topupTransfer(const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
{
httpClient->put("/v1/accounts/" + accountStr + "/balance",
budgetResultCallback(onResult),
Expand All @@ -108,14 +107,14 @@ setBudget(const std::string &topLevelAccount,
void
HttpLayer::
getAccountSummary(
const AccountKey &account,
int depth,
std::function<void (std::exception_ptr, AccountSummary &&)>
onResult)
const AccountKey &account,
int depth,
std::function<void (std::exception_ptr, AccountSummary &&)>
onResult)
{
httpClient->get("/v1/accounts/" + account.toString() + "/summary",
makeCallback<AccountSummary>(
"HttpLayer::getAccountSummary",
"HttpLayer::getAccountSummary",
onResult),
{ { "depth", to_string(depth) } });
}
Expand All @@ -127,8 +126,8 @@ getAccount(const AccountKey &account,
{
httpClient->get("/v1/accounts/" + account.toString(),
makeCallback<Account>(
"HttpLayer::getAccount",
onResult));
"HttpLayer::getAccount",
onResult));
}

void
Expand All @@ -140,8 +139,8 @@ addSpendAccount(const std::string &shadowStr,
makeCallback<Account>("HttpLayer::addSpendAccount", onDone),
{ },
{
{ "accountName", shadowStr },
{ "accountType", "spend" }
{ "accountName", shadowStr },
{ "accountType", "spend" }
});
}

Expand All @@ -159,23 +158,22 @@ syncAccount(const ShadowAccount &account, const std::string &shadowStr,
void
HttpLayer::
request(std::string method, const std::string &resource,
const RestParams &params, const std::string &content, OnRequestResult onResult)
const RestParams &params, const std::string &content, OnRequestResult onResult)
{
std::transform(begin(method), end(method), begin(method), [](char c) { return ::tolower(c); });

auto onDone = std::make_shared<HttpClientSimpleCallbacks>(
[=](const HttpRequest &,
HttpClientError error, int statusCode,
std::string &&, std::string &&body)
{
[=](const HttpRequest &,
HttpClientError error, int statusCode,
std::string &&, std::string &&body) {
if (error != HttpClientError::NONE) {
std::ostringstream oss;
oss << error;
onResult(std::make_exception_ptr(
ML::Exception("HTTP Request failed with return code %s", oss.str().c_str())),
statusCode, "");
}
else {
ML::Exception("HTTP Request failed with return code %s", oss.str().c_str())),
statusCode, "");
}
else {
onResult(nullptr, statusCode, body);
}
});
Expand All @@ -201,13 +199,12 @@ budgetResultCallback(const BudgetController::OnBudgetResult &onResult)
return std::make_shared<HttpClientSimpleCallbacks>(
[=](const HttpRequest &,
HttpClientError error, int statusCode,
std::string &&, std::string &&body)
{
std::string &&, std::string &&body) {
if (error != HttpClientError::NONE) {
std::ostringstream oss;
oss << error;
onResult(std::make_exception_ptr(
ML::Exception("HTTP Request failed with return code %s", oss.str().c_str())));
ML::Exception("HTTP Request failed with return code %s", oss.str().c_str())));
}
else {
onResult(nullptr);
Expand All @@ -234,23 +231,23 @@ addAccount(const AccountKey &account,
const BudgetController::OnBudgetResult &onResult)
{
proxy->push(budgetResultCallback(onResult),
"POST", "/v1/accounts",
{ {"accountName", account.toString()},
{ "accountType", "budget" } });
"POST", "/v1/accounts",
{ {"accountName", account.toString()},
{ "accountType", "budget" } });
}


void
ZmqLayer::
toPopupTransfer(const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
topupTransfer(const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult)
{
proxy->push(budgetResultCallback(onResult),
"PUT", "/v1/accounts/" + accountStr + "/balance",
{ { "accountType", AccountTypeToString(accountType) } },
amount.toJson().toString());
"PUT", "/v1/accounts/" + accountStr + "/balance",
{ { "accountType", AccountTypeToString(accountType) } },
amount.toJson().toString());
}

void
Expand All @@ -260,23 +257,23 @@ setBudget(const std::string &topLevelAccount,
const BudgetController::OnBudgetResult &onResult)
{
proxy->push(budgetResultCallback(onResult),
"PUT", "/v1/accounts/" + topLevelAccount + "/budget",
{ /* {"amount", amount.toString()}*/ },
amount.toJson().toString());
"PUT", "/v1/accounts/" + topLevelAccount + "/budget",
{ /* {"amount", amount.toString()}*/ },
amount.toJson().toString());
}

void
ZmqLayer::
getAccountSummary(
const AccountKey &account,
int depth,
std::function<void (std::exception_ptr, AccountSummary &&)>
onResult)
const AccountKey &account,
int depth,
std::function<void (std::exception_ptr, AccountSummary &&)>
onResult)
{
proxy->push(makeRestResponseJsonDecoder<AccountSummary>("ZmqLayer::getAccountSummary", onResult),
"GET", "/v1/accounts/" + account.toString() + "/summary",
{ {"depth", to_string(depth)} },
"");
"GET", "/v1/accounts/" + account.toString() + "/summary",
{ {"depth", to_string(depth)} },
"");
}

void
Expand All @@ -294,31 +291,31 @@ addSpendAccount(const std::string &shadowStr,
std::function<void (std::exception_ptr, Account &&)> onDone)
{
proxy->push(makeRestResponseJsonDecoder<Account>("ZmqLayer::addSpendAccount", onDone),
"POST",
"/v1/accounts",
{
{ "accountName", shadowStr },
{ "accountType", "spend" }
},
"");
"POST",
"/v1/accounts",
{
{ "accountName", shadowStr },
{ "accountType", "spend" }
},
"");
}

void
ZmqLayer::
syncAccount(const ShadowAccount &account, const std::string &shadowStr,
std::function<void (std::exception_ptr, Account &&)> onDone)
std::function<void (std::exception_ptr, Account &&)> onDone)
{
proxy->push(makeRestResponseJsonDecoder<Account>("ZmqLayer::syncAccount", onDone),
"PUT",
"/v1/accounts/" + shadowStr + "/shadow",
{},
account.toJson().toString());
"PUT",
"/v1/accounts/" + shadowStr + "/shadow",
{},
account.toJson().toString());
}

void
ZmqLayer::
request(std::string method, const std::string &resource,
const RestParams &params, const std::string &content, OnRequestResult onResult)
const RestParams &params, const std::string &content, OnRequestResult onResult)
{
proxy->push(onResult, method, resource, params, content);
}
Expand All @@ -328,12 +325,11 @@ RestProxy::OnDone
ZmqLayer::
budgetResultCallback(const BudgetController::OnBudgetResult &onResult)
{
return [=] (std::exception_ptr ptr, int resultCode, string body)
{
//cerr << "got budget result callback with resultCode "
// << resultCode << " body " << body << endl;
onResult(ptr);
};
return [=] (std::exception_ptr ptr, int resultCode, string body) {
//cerr << "got budget result callback with resultCode "
// << resultCode << " body " << body << endl;
onResult(ptr);
};
}

} // namespace RTBKIT
12 changes: 6 additions & 6 deletions rtbkit/core/banker/application_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ struct ApplicationLayer : public MessageLoop {
const AccountKey &account,
const BudgetController::OnBudgetResult &onResult) = 0;

virtual void toPopupTransfer(
virtual void topupTransfer(
const AccountKey &account,
AccountType accountType,
CurrencyPool amount,
const BudgetController::OnBudgetResult &onResult);

virtual void toPopupTransfer(
virtual void topupTransfer(
const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
Expand Down Expand Up @@ -90,8 +90,8 @@ struct HttpLayer : public ApplicationLayer {
const AccountKey &account,
const BudgetController::OnBudgetResult &onResult);

using ApplicationLayer::toPopupTransfer;
void toPopupTransfer(
using ApplicationLayer::topupTransfer;
void topupTransfer(
const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
Expand Down Expand Up @@ -143,8 +143,8 @@ struct ZmqLayer : public ApplicationLayer {
const AccountKey &account,
const BudgetController::OnBudgetResult &onResult);

using ApplicationLayer::toPopupTransfer;
void toPopupTransfer(
using ApplicationLayer::topupTransfer;
void topupTransfer(
const std::string &accountStr,
AccountType accountType,
CurrencyPool amount,
Expand Down
Loading