You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/07/31 03:46:27 UTC
[3/3] git commit: Removed /vars endpoints from the Master and Slave.
Removed /vars endpoints from the Master and Slave.
Review: https://reviews.apache.org/r/13048
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/02fdd03d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/02fdd03d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/02fdd03d
Branch: refs/heads/master
Commit: 02fdd03dfbb8870d0bed20b75b5cbac90a5586fb
Parents: 9a8a858
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Jul 29 17:45:51 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Jul 30 18:43:01 2013 -0700
----------------------------------------------------------------------
src/master/http.cpp | 21 ---------------------
src/master/master.cpp | 1 -
src/master/master.hpp | 4 ----
src/slave/http.cpp | 22 ----------------------
src/slave/slave.cpp | 1 -
src/slave/slave.hpp | 4 ----
6 files changed, 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index a114462..ec9b05a 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -230,27 +230,6 @@ JSON::Object model(const Role& role)
}
-Future<Response> Master::Http::vars(const Request& request)
-{
- LOG(INFO) << "HTTP request for '" << request.path << "'";
-
- // TODO(benh): Consider separating collecting the actual vars we
- // want to display from rendering them. Trying to just create a
- // map<string, string> required a lot of calls to stringify (or
- // using an std::ostringstream) and didn't actually seem to be that
- // much more clear than just rendering directly.
- std::ostringstream out;
-
- out <<
- "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"));
-}
-
Future<Response> Master::Http::redirect(const Request& request)
{
LOG(INFO) << "HTTP request for '" << request.path << "'";
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index e4507ac..690b558 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -406,7 +406,6 @@ void Master::initialize()
// Setup HTTP routes.
route("/redirect", None(), bind(&Http::redirect, http, params::_1));
- route("/vars", None(), bind(&Http::vars, http, params::_1));
route("/stats.json", None(), bind(&Http::stats, http, params::_1));
route("/state.json", None(), bind(&Http::state, http, params::_1));
route("/roles.json", None(), bind(&Http::roles, http, params::_1));
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index bdaf4d6..f0e46a3 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -199,10 +199,6 @@ private:
public:
Http(const Master& _master) : master(_master) {}
- // /master/vars
- process::Future<process::http::Response> vars(
- const process::http::Request& request);
-
// /master/redirect
process::Future<process::http::Response> redirect(
const process::http::Request& request);
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index b7d1582..12a866c 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -244,28 +244,6 @@ JSON::Object model(const Framework& framework)
}
-Future<Response> Slave::Http::vars(const Request& request)
-{
- LOG(INFO) << "HTTP request for '" << request.path << "'";
-
- // TODO(benh): Consider separating collecting the actual vars we
- // want to display from rendering them. Trying to just create a
- // map<string, string> required a lot of calls to stringify (or
- // using an std::ostringstream) and didn't actually seem to be that
- // much more clear than just rendering directly.
- std::ostringstream out;
-
- out <<
- "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"));
-}
-
-
Future<Response> Slave::Http::stats(const Request& request)
{
LOG(INFO) << "HTTP request for '" << request.path << "'";
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 54eaf8f..8fb47f6 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -362,7 +362,6 @@ void Slave::initialize()
install("PING", &Slave::ping);
// Setup HTTP routes.
- route("/vars", None(), bind(&Http::vars, http, params::_1));
route("/stats.json", None(), bind(&Http::stats, http, params::_1));
route("/state.json", None(), bind(&Http::state, http, params::_1));
http://git-wip-us.apache.org/repos/asf/mesos/blob/02fdd03d/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index 5a0fdd9..f2c5e56 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -259,10 +259,6 @@ private:
public:
Http(const Slave& _slave) : slave(_slave) {}
- // /slave/vars
- process::Future<process::http::Response> vars(
- const process::http::Request& request);
-
// /slave/stats.json
process::Future<process::http::Response> stats(
const process::http::Request& request);