From e95dac748371afcad3ffddf5c98e5fcb0a8302b7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 3 Aug 2016 13:41:42 +0200 Subject: connect websocket to correct path --- webgui/src/Main.hs | 2 +- webgui/thermoprint-webgui.cabal | 2 +- webgui/thermoprint-webgui.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webgui/src/Main.hs b/webgui/src/Main.hs index e4b25e6..03cd318 100644 --- a/webgui/src/Main.hs +++ b/webgui/src/Main.hs @@ -500,7 +500,7 @@ withWebSocket :: (Config -> Window -> Event (Either WebSocketException URI) -> U withWebSocket setup c@(Config{..}) w = do (dataUpdate, triggerData) <- liftIO newEvent let - rcvEvents = runClient (baseUrlHost server) (baseUrlPort server) "/" $ forever . (triggerData . maybe (Left InvalidMessage) Right . parseURIReference . T.unpack <=< receiveData) + rcvEvents = runClient (baseUrlHost server) (baseUrlPort server) (baseUrlPath server) $ forever . (triggerData . maybe (Left InvalidMessage) Right . parseURIReference . T.unpack <=< receiveData) liftIOLater . void $ forkFinally rcvEvents (triggerData . Left . either Unhandled (const ProcessDied)) void $ setup c w dataUpdate diff --git a/webgui/thermoprint-webgui.cabal b/webgui/thermoprint-webgui.cabal index 25af096..9c67a9c 100644 --- a/webgui/thermoprint-webgui.cabal +++ b/webgui/thermoprint-webgui.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: thermoprint-webgui -version: 1.0.1 +version: 1.0.2 synopsis: Threepenny interface for thermoprint-spec compliant servers -- description: homepage: http://dirty-haskell.org/tags/thermoprint.html diff --git a/webgui/thermoprint-webgui.nix b/webgui/thermoprint-webgui.nix index aa4b7af..d4cafe8 100644 --- a/webgui/thermoprint-webgui.nix +++ b/webgui/thermoprint-webgui.nix @@ -5,7 +5,7 @@ }: mkDerivation { pname = "thermoprint-webgui"; - version = "1.0.1"; + version = "1.0.2"; src = ./.; isLibrary = false; isExecutable = true; -- cgit v1.2.3