From 543f92d285d26469d549f7514751dda6ea9be471 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Fri, 7 Oct 2016 17:54:45 +0300 Subject: Change websocket url to use gitlab-workhorse. --- app/assets/javascripts/terminal/terminal.js.es6 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/terminal/terminal.js.es6 b/app/assets/javascripts/terminal/terminal.js.es6 index de291fd232d..67435aa3db0 100644 --- a/app/assets/javascripts/terminal/terminal.js.es6 +++ b/app/assets/javascripts/terminal/terminal.js.es6 @@ -9,8 +9,6 @@ gl.Terminal = class { options.screenKeys = options.screenKeys || true; options.cols = options.cols || 100; options.rows = options.rows || 40; - options.sessionId = options.sessionId || ''; - options.port = options.port || 5000; this.container = document.querySelector(options.selector); this.setSocketUrl(); @@ -18,10 +16,10 @@ gl.Terminal = class { } setSocketUrl() { - const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'; - const {sessionId, port} = this.options; + const {protocol, hostname, port} = window.location; + const wsProtocol = protocol === 'https:' ? 'wss://' : 'ws://'; - this.socketUrl = `${protocol}${location.hostname}:${port}/shell/${sessionId}?${document.cookie}`; + this.socketUrl = `${wsProtocol}${hostname}:${port}/gitlab-org/gitlab-ce/deployments/4/terminal_websocket` } createTerminal() { -- cgit v1.2.1