diff options
author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-08-03 13:41:42 +0200 |
---|---|---|
committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-08-03 13:41:42 +0200 |
commit | e95dac748371afcad3ffddf5c98e5fcb0a8302b7 (patch) | |
tree | f986b0e2237c2f849341b9b33c370c5f6d922dc0 | |
parent | 947fdb54351071745b6f35f668e39a2b1207918e (diff) | |
download | thermoprint-e95dac748371afcad3ffddf5c98e5fcb0a8302b7.tar thermoprint-e95dac748371afcad3ffddf5c98e5fcb0a8302b7.tar.gz thermoprint-e95dac748371afcad3ffddf5c98e5fcb0a8302b7.tar.bz2 thermoprint-e95dac748371afcad3ffddf5c98e5fcb0a8302b7.tar.xz thermoprint-e95dac748371afcad3ffddf5c98e5fcb0a8302b7.zip |
connect websocket to correct path
-rw-r--r-- | webgui/src/Main.hs | 2 | ||||
-rw-r--r-- | webgui/thermoprint-webgui.cabal | 2 | ||||
-rw-r--r-- | 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 | |||
500 | withWebSocket setup c@(Config{..}) w = do | 500 | withWebSocket setup c@(Config{..}) w = do |
501 | (dataUpdate, triggerData) <- liftIO newEvent | 501 | (dataUpdate, triggerData) <- liftIO newEvent |
502 | let | 502 | let |
503 | rcvEvents = runClient (baseUrlHost server) (baseUrlPort server) "/" $ forever . (triggerData . maybe (Left InvalidMessage) Right . parseURIReference . T.unpack <=< receiveData) | 503 | rcvEvents = runClient (baseUrlHost server) (baseUrlPort server) (baseUrlPath server) $ forever . (triggerData . maybe (Left InvalidMessage) Right . parseURIReference . T.unpack <=< receiveData) |
504 | liftIOLater . void $ forkFinally rcvEvents (triggerData . Left . either Unhandled (const ProcessDied)) | 504 | liftIOLater . void $ forkFinally rcvEvents (triggerData . Left . either Unhandled (const ProcessDied)) |
505 | void $ setup c w dataUpdate | 505 | void $ setup c w dataUpdate |
506 | 506 | ||
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 @@ | |||
2 | -- documentation, see http://haskell.org/cabal/users-guide/ | 2 | -- documentation, see http://haskell.org/cabal/users-guide/ |
3 | 3 | ||
4 | name: thermoprint-webgui | 4 | name: thermoprint-webgui |
5 | version: 1.0.1 | 5 | version: 1.0.2 |
6 | synopsis: Threepenny interface for thermoprint-spec compliant servers | 6 | synopsis: Threepenny interface for thermoprint-spec compliant servers |
7 | -- description: | 7 | -- description: |
8 | homepage: http://dirty-haskell.org/tags/thermoprint.html | 8 | 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 @@ | |||
5 | }: | 5 | }: |
6 | mkDerivation { | 6 | mkDerivation { |
7 | pname = "thermoprint-webgui"; | 7 | pname = "thermoprint-webgui"; |
8 | version = "1.0.1"; | 8 | version = "1.0.2"; |
9 | src = ./.; | 9 | src = ./.; |
10 | isLibrary = false; | 10 | isLibrary = false; |
11 | isExecutable = true; | 11 | isExecutable = true; |