You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/28 04:19:51 UTC
[2/3] mesos git commit: Updated `/slaves` master HTTP endpoint to use
`jsonify`.
Updated `/slaves` master HTTP endpoint to use `jsonify`.
Review: https://reviews.apache.org/r/43822/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dd74d4be
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dd74d4be
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dd74d4be
Branch: refs/heads/master
Commit: dd74d4be9034779921f6cbc80c80c9941a0831ac
Parents: f29d66c
Author: Neil Conway <ne...@gmail.com>
Authored: Sat Feb 27 18:58:55 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Sat Feb 27 19:07:19 2016 -0800
----------------------------------------------------------------------
src/master/http.cpp | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dd74d4be/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 31d2e0d..46a8b5a 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -1223,20 +1223,15 @@ string Master::Http::SLAVES_HELP()
Future<Response> Master::Http::slaves(const Request& request) const
{
- JSON::Object object;
-
- {
- JSON::Array array;
- array.values.reserve(master->slaves.registered.size()); // MESOS-2353.
-
- foreachvalue (const Slave* slave, master->slaves.registered) {
- array.values.push_back(model(*slave));
- }
-
- object.values["slaves"] = std::move(array);
- }
+ auto slaves = [this](JSON::ObjectWriter* writer) {
+ writer->field("slaves", [this](JSON::ArrayWriter* writer) {
+ foreachvalue (const Slave* slave, master->slaves.registered) {
+ writer->element(Full<Slave>(*slave));
+ }
+ });
+ };
- return OK(object, request.url.query.get("jsonp"));
+ return OK(jsonify(slaves), request.url.query.get("jsonp"));
}