From 7354ab21e974de3469dec737c110233512af33ed Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 8 Mar 2018 17:19:52 -0500 Subject: [PATCH] Fix default connection string Fixes #38 --- src/ui/connection.js | 6 +++--- webpack.config.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/connection.js b/src/ui/connection.js index ed8f9d9..c5497d6 100644 --- a/src/ui/connection.js +++ b/src/ui/connection.js @@ -28,11 +28,11 @@ class ConnectionOverlay extends Component { if (socket.state === SOCKET_STATE.DISCONNECTED) { const uri = localStorage.getItem("autoconnect"); const password = localStorage.getItem("password"); - this.state = { - uri: uri || "ws://127.0.0.1:8412", + this.setState({ + uri: uri || process.env.DEFAULT_WS_URI, password, autoconnect: !!uri - }; + }); if (uri) { initialize(getURI(this.state.uri, this.state.password)); } diff --git a/webpack.config.js b/webpack.config.js index be0a6f5..80c6921 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,7 +2,7 @@ const path = require("path"); const webpack = require("webpack"); const defines = { - "DEFAULT_WS_URI": process.env.WEBSOCKET_URI || "ws://localhost:8412/" + "DEFAULT_WS_URI": process.env.WEBSOCKET_URI || "ws://127.0.0.1:8412/" }; const env = process.env.ENVIRONMENT || "development";