You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/08/13 21:49:48 UTC
[04/23] git commit: Exposed version in "/vars" and "/state.json"
endpoints.
Exposed version in "/vars" and "/state.json" endpoints.
Review: https://reviews.apache.org/r/11642
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e029cf50
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e029cf50
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e029cf50
Branch: refs/heads/vinod/0.13.0
Commit: e029cf507fa970b331bb95f6e2946e0e1b676997
Parents: 9029967
Author: Vinod Kone <vi...@twitter.com>
Authored: Tue Jun 4 15:05:42 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri Jun 7 15:19:28 2013 -0700
----------------------------------------------------------------------
src/master/http.cpp | 10 +++++++---
src/slave/http.cpp | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e029cf50/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 7e105a4..47471d6 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -22,6 +22,8 @@
#include <string>
#include <vector>
+#include <mesos/mesos.hpp>
+
#include <stout/foreach.hpp>
#include <stout/json.hpp>
#include <stout/net.hpp>
@@ -225,9 +227,10 @@ Future<Response> vars(
std::ostringstream out;
out <<
- "build_date " << build::DATE << "\n" <<
- "build_user " << build::USER << "\n" <<
- "build_flags " << build::FLAGS << "\n";
+ "version: " << MESOS_VERSION << "\n" <<
+ "build_date: " << build::DATE << "\n" <<
+ "build_user: " << build::USER << "\n" <<
+ "build_flags: " << build::FLAGS << "\n";
// TODO(benh): Output flags.
return OK(out.str(), request.query.get("jsonp"));
@@ -311,6 +314,7 @@ Future<Response> state(
VLOG(1) << "HTTP request for '" << request.path << "'";
JSON::Object object;
+ object.values["version"] = MESOS_VERSION;
object.values["build_date"] = build::DATE;
object.values["build_time"] = build::TIME;
object.values["build_user"] = build::USER;
http://git-wip-us.apache.org/repos/asf/mesos/blob/e029cf50/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 67877c9..e362c30 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -21,6 +21,8 @@
#include <string>
#include <vector>
+#include <mesos/mesos.hpp>
+
#include <stout/foreach.hpp>
#include <stout/json.hpp>
#include <stout/net.hpp>
@@ -261,9 +263,10 @@ Future<Response> vars(
std::ostringstream out;
out <<
- "build_date " << build::DATE << "\n" <<
- "build_user " << build::USER << "\n" <<
- "build_flags " << build::FLAGS << "\n";
+ "version: " << MESOS_VERSION << "\n" <<
+ "build_date: " << build::DATE << "\n" <<
+ "build_user: " << build::USER << "\n" <<
+ "build_flags: " << build::FLAGS << "\n";
// TODO(benh): Output flags.
return OK(out.str(), request.query.get("jsonp"));
@@ -301,6 +304,7 @@ Future<Response> state(
LOG(INFO) << "HTTP request for '" << request.path << "'";
JSON::Object object;
+ object.values["version"] = MESOS_VERSION;
object.values["build_date"] = build::DATE;
object.values["build_time"] = build::TIME;
object.values["build_user"] = build::USER;