git.iko.soy/project-m36
on master help sign in
add support for network-transport-tcp 0.6.0
commitb0fd8a3ee8e1929f805e7a0b22f427b1b0bbcce2 authorAgentM <agentm@themactionfaction.com> dateSat 7 Jul 2018, 14:42 (8 years ago) parentb21d575
6 files changed+29−3
compare with master
unifiedsplit
project-m36.cabal+2−2 src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+5 src/lib/ProjectM36/Client.hs+10−1 src/lib/ProjectM36/Server.hs+4 test/Server/Main.hs+4 test/Server/WebSocket.hs+4
project-m36.cabal+2−2
@@ -79,8 +79,8 @@ Library
7979 ,distributed-process >= 0.6.6
8080 ,distributed-process-extras >= 0.3.2
8181 ,distributed-process-async >= 0.2.4
82− ,network-transport-tcp
83− ,network-transport
82+ ,network-transport-tcp >= 0.6.0
83+ ,network
8484 ,list-t
8585 ,stm-containers >= 0.2.15
8686 ,optparse-applicative
src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+5
@@ -1,10 +1,15 @@
1+{-# LANGUAGE CPP #-}
12import ProjectM36.Server.WebSocket
23import ProjectM36.Server.Config
34import ProjectM36.Server.ParseArgs
45import ProjectM36.Server
56import Control.Concurrent
67import qualified Network.WebSockets as WS
8+#if MIN_VERSION_network_transport_tcp(0,6,0)
9+import Network.Transport.TCP.Internal (decodeEndPointAddress)
10+#else
711import Network.Transport.TCP (decodeEndPointAddress)
12+#endif
813import Control.Exception
914
1015main :: IO ()
src/lib/ProjectM36/Client.hs+10−1
@@ -128,7 +128,12 @@ import Control.Exception.Base
128128import GHC.Conc.Sync
129129
130130import Network.Transport (Transport(closeTransport))
131−import Network.Transport.TCP (createTransport, defaultTCPParameters, encodeEndPointAddress)
131+#if MIN_VERSION_network_transport_tcp(0,6,0)
132+import Network.Transport.TCP.Internal (encodeEndPointAddress)
133+#else
134+import Network.Transport.TCP (encodeEndPointAddress)
135+#endif
136+import Network.Transport.TCP (createTransport, defaultTCPParameters)
132137import Control.Distributed.Process.Node (newLocalNode, initRemoteTable, runProcess, LocalNode, forkProcess, closeLocalNode)
133138import Control.Distributed.Process.Extras.Internal.Types (whereisRemote)
134139import Control.Distributed.Process.ManagedProcess.Client (call, safeCall)
@@ -252,7 +257,11 @@ remoteDBLookupName = (++) "db-"
252257
253258createLocalNode :: IO (LocalNode, Transport)
254259createLocalNode = do
260+#if MIN_VERSION_network_transport_tcp(0,6,0)
261+ eLocalTransport <- createTransport "127.0.0.1" "0" (\sn -> ("127.0.0.1", sn)) defaultTCPParameters
262+#else
255263 eLocalTransport <- createTransport "127.0.0.1" "0" defaultTCPParameters
264+#endif
256265 case eLocalTransport of
257266 Left err -> error ("failed to create transport: " ++ show err)
258267 Right localTransport -> do
src/lib/ProjectM36/Server.hs+4
@@ -116,7 +116,11 @@ launchServer daemonConfig mAddressMVar = do
116116 Right conn -> do
117117 let hostname = bindHost daemonConfig
118118 port = bindPort daemonConfig
119+#if MIN_VERSION_network_transport_tcp(0,6,0)
120+ etransport <- createTransport hostname (show port) (\nam -> (hostname, nam)) defaultTCPParameters
121+#else
119122 etransport <- createTransport hostname (show port) defaultTCPParameters
123+#endif
120124 case etransport of
121125 Left err -> error ("failed to create transport: " ++ show err)
122126 Right transport -> do
test/Server/Main.hs+4
@@ -17,7 +17,11 @@ import System.Exit
1717
1818import Control.Concurrent
1919import Network.Transport (EndPointAddress)
20+#if MIN_VERSION_network_transport_tcp(0,6,0)
21+import Network.Transport.TCP.Internal (encodeEndPointAddress, decodeEndPointAddress)
22+#else
2023import Network.Transport.TCP (encodeEndPointAddress, decodeEndPointAddress)
24+#endif
2125import Data.Either (isRight)
2226import Control.Exception
2327import System.IO.Temp
test/Server/WebSocket.hs+4
@@ -17,7 +17,11 @@ import Data.Aeson
1717import qualified Data.Map as M
1818import qualified Data.ByteString.Lazy as BS
1919import ProjectM36.Relation
20+#if MIN_VERSION_network_transport_tcp(0,6,0)
21+import Network.Transport.TCP.Internal (decodeEndPointAddress)
22+#else
2023import Network.Transport.TCP (decodeEndPointAddress)
24+#endif
2125
2226--start the websocket server
2327-- run some tutoriald against it