From c685cd72fcbe826f8a3e9cb99bd8c4af0c41785b Mon Sep 17 00:00:00 2001
From: Anna <sudnitsina@gmail.com>
Date: Mon, 26 Mar 2018 22:55:37 +0300
Subject: [PATCH] soket url

---
 conf.json                 | 5 ++---
 rbmd.py                   | 4 ++--
 templates/rbmd/index.html | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf.json b/conf.json
index ef43c90..4d12a9c 100644
--- a/conf.json
+++ b/conf.json
@@ -1,5 +1,4 @@
-{   
+{
     "zookeeper" : "10.8.0.26:2181",
-    "api": "http://127.0.0.1:9076/v1",
-    "ws": "ws://py.difrex.ru/socket"
+    "api": "http://127.0.0.1:9076/v1"
 }
diff --git a/rbmd.py b/rbmd.py
index 662a507..25c4a0f 100644
--- a/rbmd.py
+++ b/rbmd.py
@@ -50,11 +50,11 @@ class MainHandler(tornado.web.RequestHandler):
         logging.info(tornado.escape.xhtml_escape(self.current_user))
         logging.info('123')
         user_id = self.get_secure_cookie("user")
-        ws = config("ws")
+        # ws = config("ws")
         try: metrics = json.loads(action('metrics', 'get'))
         except ValueError: metrics = {}
         my_status = zk_fetch("/rbmd/log/health") #action('status', 'get')
-        dct = {'ws': ws, 'metrics': metrics, 'status': my_status}
+        dct = {'metrics': metrics, 'status': my_status}
         self.render("index.html", **dct)
 
     def get_current_user(self):
diff --git a/templates/rbmd/index.html b/templates/rbmd/index.html
index 8a45b80..f0b5630 100644
--- a/templates/rbmd/index.html
+++ b/templates/rbmd/index.html
@@ -84,7 +84,8 @@
     </div>
   </body>
   <script>
-    var ws = new WebSocket('{{escape(ws)}}');
+    var url = "ws://" + location.host + "/socket";
+    var ws = new WebSocket(url);
     console.log(ws);
     var a, selected_node, deadNode, node2;
     ws.onopen = function() {ws.send(""); };