You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/02/26 03:28:34 UTC
[2/4] storm git commit: Topo page last error time blank when no errors
Topo page last error time blank when no errors
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1397246d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1397246d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1397246d
Branch: refs/heads/1.x-branch
Commit: 1397246d2b2721783bb43445a84996ec552a05d5
Parents: 2c6fc60
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Feb 24 16:12:19 2016 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Feb 24 16:12:19 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 7 +++----
.../src/ui/public/templates/topology-page-template.html | 6 +++++-
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1397246d/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj
index 9e33984..c35e051 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -178,8 +178,7 @@
(defn get-error-time
[error]
(if error
- (.get_error_time_secs ^ErrorInfo error)
- 0))
+ (.get_error_time_secs ^ErrorInfo error)))
(defn worker-dump-link [host port topology-id]
(url-format "http://%s:%s/dumps/%s/%s"
@@ -513,7 +512,7 @@
"errorTime" (get-error-time error-info)
"errorHost" host
"errorPort" port
- "errorLapsedSecs" (time-delta (get-error-time error-info))
+ "errorLapsedSecs" (if-let [t (get-error-time error-info)] (time-delta t))
"errorWorkerLogLink" (worker-log-link host port topo-id secure?)}))
(defn- common-agg-stats-json
@@ -646,7 +645,7 @@
(.get_port e)
topology-id
secure?)
- "errorLapsedSecs" (time-delta (get-error-time e))
+ "errorLapsedSecs" (if-let [t (get-error-time e)] (time-delta t))
"error" (.get_error e)})}))
(defmulti unpack-comp-agg-stat
http://git-wip-us.apache.org/repos/asf/storm/blob/1397246d/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 1f81f1b..02b3c76 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -323,7 +323,9 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
+ {{#errorTime}}
<span id="{{errorTime}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{errorTime}}</span>
+ {{/errorTime}}
</td>
{{/spouts}}
</tbody>
@@ -417,7 +419,9 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
+ {{#errorTime}}
<span id="{{errorTime}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{errorTime}}</span>
+ {{/errorTime}}
</td>
{{/bolts}}
</tbody>
@@ -512,4 +516,4 @@
{{/loggers}}
</table>
</div>
-</script>
\ No newline at end of file
+</script>