git commit: Fixed the use of a boolean in the master's stats.json endpoint.

[bm...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 0dda82203 -> cd707f1d3


Fixed the use of a boolean in the master's stats.json endpoint.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cd707f1d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cd707f1d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cd707f1d

Branch: refs/heads/master
Commit: cd707f1d3e92ff9634041f00e4b220fe7619e6aa
Parents: 0dda822
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu May 22 10:58:01 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu May 22 11:15:22 2014 -0700

----------------------------------------------------------------------
 src/master/http.cpp        | 2 +-
 src/tests/master_tests.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/cd707f1d/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index a341866..b565dc6 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -350,7 +350,7 @@ Future<Response> Master::Http::stats(const Request& request)
 
   JSON::Object object;
   object.values["uptime"] = (Clock::now() - master.startTime).secs();
-  object.values["elected"] = master.elected(); // Note: using int not bool.
+  object.values["elected"] = master.elected() ? 1 : 0;
   object.values["total_schedulers"] = master.frameworks.activated.size();
   object.values["active_schedulers"] = master.getActiveFrameworks().size();
   object.values["activated_slaves"] = master.slaves.activated.size();

http://git-wip-us.apache.org/repos/asf/mesos/blob/cd707f1d/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 1ea1da6..b0e05de 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1407,8 +1407,13 @@ TEST_F(MasterTest, MetricsInStatsEndpoint)
   JSON::Object stats = parse.get();
 
   EXPECT_EQ(1u, stats.values.count("master/uptime_secs"));
+
+  EXPECT_EQ(1u, stats.values.count("elected"));
   EXPECT_EQ(1u, stats.values.count("master/elected"));
 
+  EXPECT_EQ(1, stats.values["elected"]);
+  EXPECT_EQ(1, stats.values["master/elected"]);
+
   EXPECT_EQ(1u, stats.values.count("master/active_slaves"));
   EXPECT_EQ(1u, stats.values.count("master/inactive_slaves"));