[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesos-commits
Subject:    svn commit: r1361422 - in /incubator/mesos/trunk/src: master/master.cpp master/slaves_manager.cpp sl
From:       benh () apache ! org
Date:       2012-07-13 22:21:09
Message-ID: 20120713222110.1634E2388860 () eris ! apache ! org
[Download RAW message or body]

Author: benh
Date: Fri Jul 13 22:21:09 2012
New Revision: 1361422

URL: http://svn.apache.org/viewvc?rev=1361422&view=rev
Log:
Added '/' in front of all "routes".

Modified:
    incubator/mesos/trunk/src/master/master.cpp
    incubator/mesos/trunk/src/master/slaves_manager.cpp
    incubator/mesos/trunk/src/slave/slave.cpp

Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1361422&r1=1361421&r2=1361422&view=diff
 ==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Fri Jul 13 22:21:09 2012
@@ -439,10 +439,10 @@ void Master::initialize()
       &ExitedExecutorMessage::status);
 
   // Setup HTTP request handlers.
-  route("vars", bind(&http::vars, cref(*this), params::_1));
-  route("stats.json", bind(&http::json::stats, cref(*this), params::_1));
-  route("state.json", bind(&http::json::state, cref(*this), params::_1));
-  route("log.json", bind(&http::json::log, cref(*this), params::_1));
+  route("/vars", bind(&http::vars, cref(*this), params::_1));
+  route("/stats.json", bind(&http::json::stats, cref(*this), params::_1));
+  route("/state.json", bind(&http::json::state, cref(*this), params::_1));
+  route("/log.json", bind(&http::json::log, cref(*this), params::_1));
 
   // Provide HTTP assets from a "webui" directory. This is either
   // specified via flags (which is necessary for running out of the

Modified: incubator/mesos/trunk/src/master/slaves_manager.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/slaves_manager.cpp?rev=1361422&r1=1361421&r2=1361422&view=diff
 ==============================================================================
--- incubator/mesos/trunk/src/master/slaves_manager.cpp (original)
+++ incubator/mesos/trunk/src/master/slaves_manager.cpp Fri Jul 13 22:21:09 2012
@@ -639,12 +639,12 @@ SlavesManager::SlavesManager(const Flags
   }
 
   // Setup our HTTP endpoints.
-  route("add", &SlavesManager::add);
-  route("remove", &SlavesManager::remove);
-  route("activate", &SlavesManager::activate);
-  route("deactivate", &SlavesManager::deactivate);
-  route("activated", &SlavesManager::activated);
-  route("deactivated", &SlavesManager::deactivated);
+  route("/add", &SlavesManager::add);
+  route("/remove", &SlavesManager::remove);
+  route("/activate", &SlavesManager::activate);
+  route("/deactivate", &SlavesManager::deactivate);
+  route("/activated", &SlavesManager::activated);
+  route("/deactivated", &SlavesManager::deactivated);
 }
 
 

Modified: incubator/mesos/trunk/src/slave/slave.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/slave.cpp?rev=1361422&r1=1361421&r2=1361422&view=diff
 ==============================================================================
--- incubator/mesos/trunk/src/slave/slave.cpp (original)
+++ incubator/mesos/trunk/src/slave/slave.cpp Fri Jul 13 22:21:09 2012
@@ -294,9 +294,9 @@ void Slave::initialize()
   install("PING", &Slave::ping);
 
   // Setup some HTTP routes.
-  route("vars", bind(&http::vars, cref(*this), params::_1));
-  route("stats.json", bind(&http::json::stats, cref(*this), params::_1));
-  route("state.json", bind(&http::json::state, cref(*this), params::_1));
+  route("/vars", bind(&http::vars, cref(*this), params::_1));
+  route("/stats.json", bind(&http::json::stats, cref(*this), params::_1));
+  route("/state.json", bind(&http::json::state, cref(*this), params::_1));
 }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]