From d07841a4b10d5677a6e4f80df1ba4f1a8bd13be9 Mon Sep 17 00:00:00 2001
From: radhika <radhika@curoverse.com>
Date: Fri, 16 May 2014 22:36:05 -0400
Subject: [PATCH] 2756: use meta tag to provide websocket url to event_log js
 file

---
 apps/workbench/app/assets/javascripts/event_log.js    | 6 +++++-
 apps/workbench/app/views/application/index.html.erb   | 4 ----
 apps/workbench/app/views/layouts/application.html.erb | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index e62b6a46ef..9be2979c22 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -15,7 +15,11 @@ function subscribeToEventLog (elementId, listeningOn) {
   event_log_disp = $(window).data("arv-websocket");
   if (event_log_disp == null) {
     // create the event log dispatcher
-    event_log_disp = new WebSocket(sessionStorage.getItem("arv-websocket-url"));
+    websocket_url = $('meta[name=arv-websocket-url]').attr("content");
+    if (websocket_url == null)
+      return;
+
+    event_log_disp = new WebSocket(websocket_url);
 
     event_log_disp.onopen = onEventLogDispatcherOpen;
     event_log_disp.onmessage = onEventLogDispatcherMessage;
diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 013d35ab3a..20af6485b0 100644
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -22,7 +22,3 @@
 <% end %>
 
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.index_pane_list }%>
-
-<script>
-  sessionStorage.setItem("arv-websocket-url", "<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>");
-</script>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 2d3c4c0de0..f009ffe12c 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -14,6 +14,11 @@
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
   <meta name="description" content="">
   <meta name="author" content="">
+
+  <% if current_user %>
+  <meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>">
+  <% end %>
+
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
-- 
2.30.2