You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by br...@apache.org on 2013/11/14 23:35:03 UTC
git commit: Normalized task start/finish time in Web UI.
Updated Branches:
refs/heads/master 480f8a71f -> 6e8dff418
Normalized task start/finish time in Web UI.
Review: https://reviews.apache.org/r/15539
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6e8dff41
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6e8dff41
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6e8dff41
Branch: refs/heads/master
Commit: 6e8dff418e102ecc3e4c19da9a60d62ac9745e12
Parents: 480f8a7
Author: Brenden Matthews <br...@airbnb.com>
Authored: Thu Nov 14 11:23:06 2013 -0800
Committer: Brenden Matthews <br...@airbnb.com>
Committed: Thu Nov 14 14:34:54 2013 -0800
----------------------------------------------------------------------
src/webui/master/static/framework.html | 18 +++++++++---------
src/webui/master/static/js/controllers.js | 8 ++++----
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6e8dff41/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index 368f0f3..92f01ad 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -95,11 +95,11 @@
<td>{{task.name}}</td>
<td>{{task.state | truncateMesosState}}</td>
<td>
- <abbr title="{{task.start_time | isoDate}}">
- {{task.start_time | relativeDate}}</abbr>
+ <abbr title="{{task.start_time * 1000 | isoDate}}">
+ {{task.start_time * 1000 | relativeDate}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.start_time | isoDate}}"
+ data-clipboard-text="{{task.start_time * 1000 | isoDate}}"
tooltip="Copy start time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
@@ -163,22 +163,22 @@
<td>{{task.name}}</td>
<td>{{task.state | truncateMesosState}}</td>
<td>
- <abbr title="{{task.start_time | isoDate}}">
- {{task.start_time | relativeDate}}</abbr>
+ <abbr title="{{task.start_time * 1000 | isoDate}}">
+ {{task.start_time * 1000 | relativeDate}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.start_time | isoDate}}"
+ data-clipboard-text="{{task.start_time * 1000 | isoDate}}"
tooltip="Copy start time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
</button>
</td>
<td>
- <abbr title="{{task.finish_time | isoDate}}">
- {{task.finish_time | relativeDate}}</abbr>
+ <abbr title="{{task.finish_time * 1000 | isoDate}}">
+ {{task.finish_time * 1000 | relativeDate}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.finish_time | isoDate}}"
+ data-clipboard-text="{{task.finish_time * 1000 | isoDate}}"
tooltip="Copy finish time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
http://git-wip-us.apache.org/repos/asf/mesos/blob/6e8dff41/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 6f74859..7c7a50d 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -221,15 +221,15 @@
if (!task.executor_id) {
task.executor_id = task.id;
}
- task.start_time = task.statuses[0].timestamp * 1000
- task.finish_time = task.statuses[task.statuses.length - 1].timestamp * 1000
+ task.start_time = task.statuses[0].timestamp
+ task.finish_time = task.statuses[task.statuses.length - 1].timestamp
});
_.each(framework.completed_tasks, function(task) {
if (!task.executor_id) {
task.executor_id = task.id;
}
- task.start_time = task.statuses[0].timestamp * 1000
- task.finish_time = task.statuses[task.statuses.length - 1].timestamp * 1000
+ task.start_time = task.statuses[0].timestamp
+ task.finish_time = task.statuses[task.statuses.length - 1].timestamp
});
});