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 01:48:02 UTC
[3/9] git commit: Use javascript to color-code recent errors
Use javascript to color-code recent errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/e5efcf50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/e5efcf50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/e5efcf50
Branch: refs/heads/master
Commit: e5efcf506856c472ae7e5e36578862d2c8dd4906
Parents: 20ac58b
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Jun 25 23:49:08 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Jun 25 23:49:08 2014 +0000
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 14 +++++++-------
storm-core/src/ui/public/component.html | 10 ++++++++++
.../ui/public/templates/component-page-template.html | 4 +---
.../ui/public/templates/topology-page-template.html | 8 ++------
storm-core/src/ui/public/topology.html | 10 ++++++++++
5 files changed, 30 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e5efcf50/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 6673493..7df44a9 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -289,11 +289,11 @@
(map nil-to-zero)
(apply max)))
-(defn is-error-recent?
+(defn get-error-time
[error]
- (if error (< (time-delta (.get_error_time_secs ^ErrorInfo error))
- (* 60 30))
- false))
+ (if error
+ (time-delta (.get_error_time_secs ^ErrorInfo error))
+ ""))
(defn get-error-data
[error]
@@ -561,7 +561,7 @@
"errorHost" error-host
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port)
- (if (is-error-recent? last-error) "isRecent" "isNotRecent") true
+ "errorLapsedSecs" (get-error-time last-error)
"lastError" (get-error-data last-error) }))
(defn bolt-comp [top-id summ-map errors window include-sys?]
@@ -587,7 +587,7 @@
"errorHost" error-host
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port)
- (if (is-error-recent? last-error) "isRecent" "isNotRecent") true
+ "errorLapsedSecs" (get-error-time last-error)
"lastError" (get-error-data last-error) }))
(defn topology-summary [^TopologyInfo summ]
@@ -693,7 +693,7 @@
"errorHost" (.get_host e)
"errorPort" (.get_port e)
"errorWorkerLogLink" (worker-log-link (.get_host e) (.get_port e))
- (if (is-error-recent? e) "isRecent" "isNotRecent") true
+ "errorLapsedSecs" (get-error-time e)
"error" (.get_error e)})}))
(defn spout-stats
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e5efcf50/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 aae0245..679b366 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -96,6 +96,16 @@ $(document).ready(function() {
if(response["componentErrors"].length > 0) {
$("#component-errors-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
}
+
+ var errorCells = document.getElementsByClassName("errorSpan");
+ for (i =0; i < errorCells.length; i++)
+ {
+ var timeLapsedInSecs = errorCells[i].id;
+ if (parseInt(timeLapsedInSecs) < 1800) {
+ errorCells[i].style.color = "#9d261d";
+ errorCells[i].style.borderBottomColor = "#9d261d";
+ }
+ }
});
});
});
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e5efcf50/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 406825d..b787eb7 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -164,9 +164,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
-<span{{#isRecent}} class="red"{{/isRecent}}>
-{{error}}
-</span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{error}}</span>
</td>
</tr>
{{/componentErrors}}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e5efcf50/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 0524e05..714e355 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -113,9 +113,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
- <span{{#isRecent}} class="red"{{/isRecent}}>
- {{lastError}}
- </span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
{{/spouts}}
</tbody>
@@ -143,9 +141,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
- <span{{#isRecent}} class="red"{{/isRecent}}>
- {{lastError}}
- </span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
{{/bolts}}
</tbody>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/e5efcf50/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 1020719..46f6fc8 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -100,6 +100,16 @@ $(document).ready(function() {
config.append(Mustache.render($(template).filter("#topology-configuration-template").html(),formattedConfig));
$("#topology-configuration-table").tablesorter({ sortList: [[0,0]], headers: {}});
+
+ var errorCells = document.getElementsByClassName("errorSpan");
+ for (i =0; i < errorCells.length; i++)
+ {
+ var timeLapsedInSecs = errorCells[i].id;
+ if (parseInt(timeLapsedInSecs) < 1800) {
+ errorCells[i].style.color = "#9d261d";
+ errorCells[i].style.borderBottomColor = "#9d261d";
+ }
+ }
});
});
});