[drill] branch master updated: DRILL-6663: Fixed shutdown button

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sorabh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 671611c  DRILL-6663: Fixed shutdown button
671611c is described below

commit 671611cbf2371bb14e6448d29640b36354b14f69
Author: Venkata Jyothsna Donapati <jy...@gmail.com>
AuthorDate: Wed Aug 8 15:25:04 2018 -0700

    DRILL-6663: Fixed shutdown button
    
    closes #1424
---
 exec/java-exec/src/main/resources/rest/index.ftl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/exec/java-exec/src/main/resources/rest/index.ftl b/exec/java-exec/src/main/resources/rest/index.ftl
index 61e942a..3b2be64 100644
--- a/exec/java-exec/src/main/resources/rest/index.ftl
+++ b/exec/java-exec/src/main/resources/rest/index.ftl
@@ -435,6 +435,10 @@
             let rowElem = $(shutdownBtn).parent().parent();
             let hostAddr = $(rowElem).find('#address').contents().get(0).nodeValue.trim();
             let hostPort = $(rowElem).find('#httpPort').html();
+            // Always use the host address from the url for the current Drillbit. For details refer DRILL-6663
+            if ((rowElem.find("#current").html() == "Current")) {
+              hostAddr = location.hostname;
+            }
             let host = hostAddr+":"+hostPort
 
             if (confirm("Are you sure you want to shutdown Drillbit running on " + host + " node?")) {