You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/31 02:04:06 UTC
[02/20] git commit: Add color span to most recent error and fix ui
templates for security.
Add color span to most recent error and fix ui templates for security.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/357fd09d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/357fd09d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/357fd09d
Branch: refs/heads/security
Commit: 357fd09dff8eec1f224d7f00f5344931ec2b64df
Parents: 65aee65
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Jun 23 16:13:34 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Jun 23 16:13:34 2014 +0000
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 12 ++++++-----
storm-core/src/ui/public/component.html | 22 ++++++++++++++------
.../templates/component-page-template.html | 6 +++++-
.../templates/topology-page-template.html | 12 +++++++++--
storm-core/src/ui/public/topology.html | 4 +++-
5 files changed, 41 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/357fd09d/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 3c1be09..bc3f506 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -319,12 +319,11 @@
(map nil-to-zero)
(apply max)))
-(defn get-error-span
+(defn is-error-recent?
[error]
- (if (and error (< (time-delta (.get_error_time_secs ^ErrorInfo error))
- (* 60 30)))
- {:class "red"}
- {}))
+ (if error (< (time-delta (.get_error_time_secs ^ErrorInfo error))
+ (* 60 30))
+ false))
(defn get-error-data
[error]
@@ -597,6 +596,7 @@
"errorHost" error-host
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port top-id)
+ (if (is-error-recent? last-error) "isRecent" "isNotRecent") true
"lastError" (get-error-data last-error)}))
(defn bolt-comp [top-id summ-map errors window include-sys?]
@@ -622,6 +622,7 @@
"errorHost" error-host
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port top-id)
+ (if (is-error-recent? last-error) "isRecent" "isNotRecent") true
"lastError" (get-error-data last-error)}))
(defn topology-summary [^TopologyInfo summ]
@@ -732,6 +733,7 @@
"errorHost" (.get_host e)
"errorPort" (.get_port e)
"errorWorkerLogLink" (worker-log-link (.get_host e) (.get_port e) topology-id)
+ (if (is-error-recent? e) "isRecent" "isNotRecent") true
"error" (.get_error e)})}))
(defn spout-stats
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/357fd09d/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index 0951aed..092eb40 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -80,22 +80,32 @@ $(document).ready(function() {
componentSummary.append(Mustache.render($(template).filter("#component-summary-template").html(),response));
if(response["componentType"] == "spout") {
componentStatsDetail.append(Mustache.render($(template).filter("#spout-stats-detail-template").html(),response));
- $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if (response["spoutSummary"].length > 0) {
+ $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
outputStats.append(Mustache.render($(template).filter("#output-stats-template").html(),response));
- $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if (response["outputStats"].length > 0) {
+ $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
executorStats.append(Mustache.render($(template).filter("#executor-stats-template").html(),response));
- $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
+ if (response["executorStats"].length > 0) {
+ $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
+ }
} else {
componentStatsDetail.append(Mustache.render($(template).filter("#bolt-stats-template").html(),response));
- $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if (response["boltStats"].length > 0) {
+ $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
inputStats.append(Mustache.render($(template).filter("#bolt-input-stats-template").html(),response));
if (response["inputStats"].length > 0) {
$("#bolt-input-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
}
outputStats.append(Mustache.render($(template).filter("#bolt-output-stats-template").html(),response));
- $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
+ if (response["outputStats"].length > 0) {
+ $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
+ }
executorStats.append(Mustache.render($(template).filter("#bolt-executor-template").html(),response));
- if(response["outputStats"].length > 0) {
+ if(response["executorStats"].length > 0) {
$("#bolt-executor-table").tablesorter({ sortList: [[0,0]], headers: {}});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/357fd09d/storm-core/src/ui/public/templates/component-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/component-page-template.html b/storm-core/src/ui/public/templates/component-page-template.html
index 1e88a9e..4aac1e8 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -163,7 +163,11 @@
<td>{{time}}</td>
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
-<td>{{error}}</td>
+<td>
+<span{{#isRecent}} class="red"{{/isRecent}}>
+{{error}}
+</span>
+</td>
</tr>
{{/componentErrors}}
</tbody>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/357fd09d/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html
index 3e82a96..188a6f1 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -124,7 +124,11 @@
<td>{{failed}}</td>
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
- <td>{{lastError}}</td>
+ <td>
+ <span{{#isRecent}} class="red"{{/isRecent}}>
+ {{lastError}}
+ </span>
+ </td>
{{/spouts}}
</tbody>
</table>
@@ -150,7 +154,11 @@
<td>{{failed}}</td>
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
- <td>{{lastError}}</td>
+ <td>
+ <span{{#isRecent}} class="red"{{/isRecent}}>
+ {{lastError}}
+ </span>
+ </td>
{{/bolts}}
</tbody>
</script>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/357fd09d/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index 74afb08..db1a500 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -89,7 +89,9 @@ $(document).ready(function() {
topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
topologyActions.append(Mustache.render($(template).filter("#topology-actions-template").html(),buttonJsonData));
topologyStats.append(Mustache.render($(template).filter("#topology-stats-template").html(),response));
- $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ if(response["topologyStats"].length > 0) {
+ $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
+ }
spoutStats.append(Mustache.render($(template).filter("#spout-stats-template").html(),response));
if(response["spouts"].length > 0) {
$("#spout-stats-table").tablesorter({sortList: [[0,0]], headers:{}});