Enable/disable Debug button on UI if eventloggers are enabled. Also show tooltip on Debug button
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3354cc73 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3354cc73 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3354cc73 Branch: refs/heads/1.x-branch Commit: 3354cc7369a494ef9645df08d0803dedfb3d9192 Parents: a33bc45 Author: Roshan Naik <[email protected]> Authored: Wed Mar 30 16:30:43 2016 -0700 Committer: Roshan Naik <[email protected]> Committed: Wed Mar 30 16:30:43 2016 -0700 ---------------------------------------------------------------------- storm-core/src/ui/public/js/script.js | 4 ++-- storm-core/src/ui/public/templates/topology-page-template.html | 2 +- storm-core/src/ui/public/topology.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/3354cc73/storm-core/src/ui/public/js/script.js ---------------------------------------------------------------------- diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js index a880205..c25195d 100644 --- a/storm-core/src/ui/public/js/script.js +++ b/storm-core/src/ui/public/js/script.js @@ -210,7 +210,7 @@ function renderToggleSys(div) { } } -function topologyActionJson(id, encodedId, name, status, msgTimeout, debug, samplingPct) { +function topologyActionJson(id, encodedId, name, status, msgTimeout, loggersTotal, debug, samplingPct) { var jsonData = {}; jsonData["id"] = id; jsonData["encodedId"] = encodedId; @@ -220,7 +220,7 @@ function topologyActionJson(id, encodedId, name, status, msgTimeout, debug, samp jsonData["deactivateStatus"] = (status === "ACTIVE") ? "enabled" : "disabled"; jsonData["rebalanceStatus"] = (status === "ACTIVE" || status === "INACTIVE" ) ? "enabled" : "disabled"; jsonData["killStatus"] = (status !== "KILLED") ? "enabled" : "disabled"; - jsonData["startDebugStatus"] = (status === "ACTIVE" && !debug) ? "enabled" : "disabled"; + jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled"; jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled"; jsonData["currentSamplingPct"] = samplingPct; return jsonData; http://git-wip-us.apache.org/repos/asf/storm/blob/3354cc73/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 02b3c76..a72effc 100644 --- a/storm-core/src/ui/public/templates/topology-page-template.html +++ b/storm-core/src/ui/public/templates/topology-page-template.html @@ -434,7 +434,7 @@ <input {{deactivateStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'deactivate', false)" type="button" value="Deactivate" class="btn btn-default"> <input {{rebalanceStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'rebalance', true, {{msgTimeout}}, 'wait time in seconds')" type="button" value="Rebalance" class="btn btn-default"> <input {{killStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'kill', true, 30, 'wait time in seconds')" type="button" value="Kill" class="btn btn-default"> - <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default"> + <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default" style="pointer-events:all; cursor: default;" title="To debug, set topology.eventlogger.executors > 0"> <input {{stopDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/disable', false, 0, 'sampling percentage', 'stop debugging')" type="button" value="Stop Debug" class="btn btn-default"> <input type="button" {{logLevel}} value="Change Log Level" onclick="toggleChangeLogLevel()" class="btn btn-default"> </p> http://git-wip-us.apache.org/repos/asf/storm/blob/3354cc73/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 feb81f8..061fd91 100644 --- a/storm-core/src/ui/public/topology.html +++ b/storm-core/src/ui/public/topology.html @@ -285,7 +285,7 @@ $(document).ready(function() { var searchForm = $("#search-form") var formattedConfig = formatConfigData(response["configuration"]); var buttonJsonData = topologyActionJson(response["id"],response["encodedId"],response["name"],response["status"] - ,response["msgTimeout"],response["debug"],response["samplingPct"]); + ,response["msgTimeout"],response["configuration"]["topology.eventlogger.executors"],response["debug"],response["samplingPct"]); $.ajax ({url: "/templates/topology-page-template.html", success: function(template) { toggleChangeLogLevel = function (data) { renderLogLevelForm (template, data);
