git.iko.soy/project-m36
on master help sign in
#88 switch to stack LTS-8.5

update to latest distributed-process modules and set lower bounds

commit0c347e373cadc32cb1cc2980d9b3b81943ac4a7d authorAgentM <agentm@tanyas-imac.local> dateSat 1 Apr 2017, 14:01 (10 years ago) parent02b60f1
4 files changed+12−17
compare with master
unifiedsplit
project-m36.cabal+4−4 src/lib/ProjectM36/Server.hs+3−7 src/lib/ProjectM36/Server/EntryPoints.hs+1−2 stack.yaml+4−4
project-m36.cabal+4−4
@@ -56,10 +56,10 @@ Library
5656 ,resourcet
5757 ,http-api-data
5858--needed for remote access
59− ,distributed-process-client-server
60− ,distributed-process
61− ,distributed-process-extras
62− ,distributed-process-async
59+ ,distributed-process-client-server >= 0.2.3
60+ ,distributed-process >= 0.6.6
61+ ,distributed-process-extras >= 0.3.2
62+ ,distributed-process-async >= 0.2.4
6363 ,network-transport-tcp
6464 ,network-transport
6565 ,stm-containers
src/lib/ProjectM36/Server.hs+3−7
@@ -9,11 +9,10 @@ import ProjectM36.Server.Config (ServerConfig(..))
99import Control.Monad.IO.Class (liftIO)
1010import Network.Transport.TCP (createTransport, defaultTCPParameters)
1111import Network.Transport (EndPointAddress(..), newEndPoint, address)
12−import Control.Distributed.Process.Node (initRemoteTable, runProcess, newLocalNode)
12+import Control.Distributed.Process.Node (initRemoteTable, runProcess, newLocalNode, initRemoteTable)
1313import Control.Distributed.Process.Extras.Time (Delay(..))
14−import Control.Distributed.Process (Process, register, RemoteTable, getSelfPid)
14+import Control.Distributed.Process (Process, register, getSelfPid)
1515import Control.Distributed.Process.ManagedProcess (defaultProcess, UnhandledMessagePolicy(..), ProcessDefinition(..), handleCall, serve, InitHandler, InitResult(..))
16−import qualified Control.Distributed.Process.Extras.Internal.Types as DIT
1716import Control.Concurrent.MVar (putMVar, MVar)
1817import System.IO (stderr, hPutStrLn)
1918
@@ -62,9 +61,6 @@ initServer (conn, dbname, mAddressMVar, saddress) = do
6261 --traceShowM ("server started on " ++ show saddress)
6362 pure $ InitOk conn Infinity
6463
65−remoteTable :: RemoteTable
66−remoteTable = DIT.__remoteTable initRemoteTable
67−
6864registerDB :: DatabaseName -> Process ()
6965registerDB dbname = do
7066 self <- getSelfPid
@@ -95,7 +91,7 @@ launchServer daemonConfig mAddressMVar = do
9591 case eEndpoint of
9692 Left err -> hPutStrLn stderr ("Failed to create transport: " ++ show err) >> pure False
9793 Right endpoint -> do
98− localTCPNode <- newLocalNode transport remoteTable
94+ localTCPNode <- newLocalNode transport initRemoteTable
9995 --traceShowM ("newLocalNode in Server " ++ show (localNodeId localTCPNode))
10096 runProcess localTCPNode $ do
10197 let testBool = testMode daemonConfig
src/lib/ProjectM36/Server/EntryPoints.hs+1−2
@@ -7,7 +7,6 @@ import Control.Distributed.Process (Process, ProcessId)
77import Control.Distributed.Process.ManagedProcess (ProcessReply)
88import Control.Distributed.Process.ManagedProcess.Server (reply)
99import Control.Distributed.Process.Async (async, task, waitCancelTimeout, AsyncResult(..))
10−import Control.Distributed.Process.Extras.Time (microSeconds)
1110import Control.Distributed.Process.Serializable (Serializable)
1211import Control.Monad.IO.Class (liftIO)
1312import Data.Map
@@ -19,7 +18,7 @@ timeoutOrDie micros act = do
1918 liftIO act >>= \x -> pure (Right x)
2019 else do
2120 asyncUnit <- async (task (liftIO act))
22− asyncRes <- waitCancelTimeout (microSeconds micros) asyncUnit
21+ asyncRes <- waitCancelTimeout micros asyncUnit
2322 case asyncRes of
2423 AsyncDone x -> pure (Right x)
2524 AsyncCancelled -> pure (Left RequestTimeoutError)
stack.yaml+4−4
@@ -2,7 +2,7 @@
22# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
33
44# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5−resolver: lts-8.0
5+resolver: lts-8.5
66
77# Local packages, usually specified by relative directory name
88packages:
@@ -16,9 +16,9 @@ extra-deps:
1616- text-1.2.2.1
1717- uuid-aeson-0.1.0.0
1818- distributed-process-0.6.6
19−- distributed-process-async-0.2.3
20−- distributed-process-client-server-0.1.3.2
21−- distributed-process-extras-0.2.1.2
19+- distributed-process-async-0.2.4
20+- distributed-process-client-server-0.2.3
21+- distributed-process-extras-0.3.2
2222
2323# Override default flag values for local packages and extra-deps
2424flags: {}