Repository: mesos Updated Branches: refs/heads/master 3f6faa499 -> b27f7f7a6
Updating formatting of some lambda calls for readability. Review: https://reviews.apache.org/r/49063 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b27f7f7a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b27f7f7a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b27f7f7a Branch: refs/heads/master Commit: b27f7f7a6d202ef68f04b17a130b3441c405904e Parents: 3f6faa4 Author: Alexander Rukletsov <al...@apache.org> Authored: Wed Jun 22 02:57:17 2016 +0200 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Sep 22 00:50:54 2016 +0200 ---------------------------------------------------------------------- src/files/files.cpp | 4 ++-- src/master/http.cpp | 62 ++++++++++++++++++++++++++---------------------- src/slave/http.cpp | 3 ++- 3 files changed, 37 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b27f7f7a/src/files/files.cpp ---------------------------------------------------------------------- diff --git a/src/files/files.cpp b/src/files/files.cpp index 5be51f4..9c634ac 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -803,8 +803,8 @@ Future<http::Response> FilesProcess::debug( request.method, authorizer, principal) - .then(defer([object, jsonp](bool authorized) - -> Future<http::Response> { + .then(defer( + [object, jsonp](bool authorized) -> Future<http::Response> { if (!authorized) { return Forbidden(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/b27f7f7a/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 9005e7c..e9f9d16 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -2574,7 +2574,8 @@ Future<Response> Master::Http::state( tasksApprover, executorsApprover, flagsApprover) - .then(defer(master->self(), + .then(defer( + master->self(), [this, request](const tuple<Owned<ObjectApprover>, Owned<ObjectApprover>, Owned<ObjectApprover>, @@ -2667,14 +2668,12 @@ Future<Response> Master::Http::state( master->frameworks.registered) { // Skip unauthorized frameworks. if (!approveViewFrameworkInfo( - frameworksApprover, framework->info)) { + frameworksApprover, framework->info)) { continue; } auto frameworkWriter = FullFrameworkWriter( - tasksApprover, - executorsApprover, - framework); + tasksApprover, executorsApprover, framework); writer->element(frameworkWriter); } @@ -3023,7 +3022,8 @@ Future<Response> Master::Http::stateSummary( } return frameworksApprover - .then(defer(master->self(), + .then(defer( + master->self(), [this, request](const Owned<ObjectApprover>& frameworksApprover) -> Response { auto stateSummary = @@ -3050,14 +3050,14 @@ Future<Response> Master::Http::stateSummary( TaskStateSummaries taskStateSummaries(master->frameworks.registered); // Model all of the slaves. - writer->field("slaves", - [this, - &slaveFrameworkMapping, - &taskStateSummaries](JSON::ArrayWriter* writer) { + writer->field( + "slaves", + [this, &slaveFrameworkMapping, &taskStateSummaries]( + JSON::ArrayWriter* writer) { foreachvalue (Slave* slave, master->slaves.registered) { - writer->element([&slave, - &slaveFrameworkMapping, - &taskStateSummaries](JSON::ObjectWriter* writer) { + writer->element( + [&slave, &slaveFrameworkMapping, &taskStateSummaries]( + JSON::ObjectWriter* writer) { json(writer, Summary<Slave>(*slave)); // Add the 'TaskState' summary for this slave. @@ -3079,8 +3079,9 @@ Future<Response> Master::Http::stateSummary( const hashset<FrameworkID>& frameworks = slaveFrameworkMapping.frameworks(slave->id); - writer->field("framework_ids", - [&frameworks](JSON::ArrayWriter* writer) { + writer->field( + "framework_ids", + [&frameworks](JSON::ArrayWriter* writer) { foreach (const FrameworkID& frameworkId, frameworks) { writer->element(frameworkId.value()); } @@ -3090,25 +3091,27 @@ Future<Response> Master::Http::stateSummary( }); // Model all of the frameworks. - writer->field("frameworks", - [this, - &slaveFrameworkMapping, - &taskStateSummaries, - &frameworksApprover](JSON::ArrayWriter* writer) { + writer->field( + "frameworks", + [this, + &slaveFrameworkMapping, + &taskStateSummaries, + &frameworksApprover](JSON::ArrayWriter* writer) { foreachpair (const FrameworkID& frameworkId, Framework* framework, master->frameworks.registered) { // Skip unauthorized frameworks. if (!approveViewFrameworkInfo( - frameworksApprover, - framework->info)) { + frameworksApprover, + framework->info)) { continue; } - writer->element([&frameworkId, - &framework, - &slaveFrameworkMapping, - &taskStateSummaries](JSON::ObjectWriter* writer) { + writer->element( + [&frameworkId, + &framework, + &slaveFrameworkMapping, + &taskStateSummaries](JSON::ObjectWriter* writer) { json(writer, Summary<Framework>(*framework)); // Add the 'TaskState' summary for this framework. @@ -3729,9 +3732,10 @@ Future<Response> Master::Http::getTasks( } return collect(frameworksApprover, tasksApprover) - .then(defer(master->self(), - [=](const tuple<Owned<ObjectApprover>, - Owned<ObjectApprover>>& approvers) + .then(defer( + master->self(), + [=](const tuple<Owned<ObjectApprover>, + Owned<ObjectApprover>>& approvers) -> Future<Response> { // Get approver from tuple. Owned<ObjectApprover> frameworksApprover; http://git-wip-us.apache.org/repos/asf/mesos/blob/b27f7f7a/src/slave/http.cpp ---------------------------------------------------------------------- diff --git a/src/slave/http.cpp b/src/slave/http.cpp index e1ba653..0aae145 100644 --- a/src/slave/http.cpp +++ b/src/slave/http.cpp @@ -938,7 +938,8 @@ Future<Response> Slave::Http::state( tasksApprover, executorsApprover, flagsApprover) - .then(defer(slave->self(), + .then(defer( + slave->self(), [this, request](const tuple<Owned<ObjectApprover>, Owned<ObjectApprover>, Owned<ObjectApprover>,
