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 2017/10/10 00:33:43 UTC
mesos git commit: Mesos UI: renamed a parameter of the
`agentURLPrefix` function.
Repository: mesos
Updated Branches:
refs/heads/master eeed32fca -> b22976436
Mesos UI: renamed a parameter of the `agentURLPrefix` function.
Rename `includeId` to `includeProcessId` and update comments to make it
clear that the parameter refers to the libprocess process id and not to
the agent's id.
Review: https://reviews.apache.org/r/62852/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b2297643
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b2297643
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b2297643
Branch: refs/heads/master
Commit: b229764369f0939f697ac125e5e23c62fde5e32b
Parents: eeed32f
Author: Gaston Kleiman <ga...@mesosphere.io>
Authored: Mon Oct 9 17:33:30 2017 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Oct 9 17:33:30 2017 -0700
----------------------------------------------------------------------
src/webui/master/static/js/controllers.js | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b2297643/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 4a9ff36..fa0ad54 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -31,9 +31,9 @@
// to consider:
//
// (1) Some endpoints for the agent process itself require
- // the agent PID.name in the path, this is to ensure
- // that the webui works correctly when running against
- // mesos-local or other instances of multiple agents
+ // the agent PID.name (processId) in the path, this is
+ // to ensure that the webui works correctly when running
+ // against mesos-local or other instances of multiple agents
// running within the same "host:port":
//
// //hostname:port/slave(1)
@@ -50,14 +50,14 @@
// Note that there are some clashing issues in mesos-local
// (e.g., hosting '/slave/log' for each agent log, we don't
// namespace metrics within '/metrics/snapshot', etc).
- function agentURLPrefix(agent, includeId) {
+ function agentURLPrefix(agent, includeProcessId) {
var port = agent.pid.substring(agent.pid.lastIndexOf(':') + 1);
- var id = agent.pid.substring(0, agent.pid.indexOf('@'));
+ var processId = agent.pid.substring(0, agent.pid.indexOf('@'));
var url = '//' + agent.hostname + ':' + port;
- if (includeId) {
- url += '/' + id;
+ if (includeProcessId) {
+ url += '/' + processId;
}
return url;
@@ -1121,8 +1121,8 @@
var agent = $scope.agents[$routeParams.agent_id];
// This variable is used in 'browse.html' to generate the '/files'
- // links, so we have to pass `includeId=false` (see agentURLPrefix for
- // more details).
+ // links, so we have to pass `includeProcessId=false` (see
+ // `agentURLPrefix`for more details).
$scope.agent_url_prefix = agentURLPrefix(agent, false);
$scope.pail = function($event, path) {