diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-08-22 13:47:23 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-08-22 13:47:23 -0400 |
commit | 013529513af62e14c2bfc0eb4f699281cdd94f84 (patch) | |
tree | 5e54d01a148587ed5d3fb9eb83eb222613a4c0e3 /HTTP | |
parent | f20df55a550cdd5ce88ef59e7bd92d3ca464ab55 (diff) | |
download | keysafe-013529513af62e14c2bfc0eb4f699281cdd94f84.tar.gz |
wire up client to Storage.Network
Diffstat (limited to 'HTTP')
-rw-r--r-- | HTTP/Client.hs | 2 | ||||
-rw-r--r-- | HTTP/Server.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/HTTP/Client.hs b/HTTP/Client.hs index 2120217..4a5106b 100644 --- a/HTTP/Client.hs +++ b/HTTP/Client.hs @@ -16,7 +16,7 @@ import Network.HTTP.Client (Manager) apiVersion :: Manager -> BaseUrl -> ClientM APIVersion motd :: Manager -> BaseUrl -> ClientM Motd getObject :: StorableObjectIdent -> Maybe ProofOfWork -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement StorableObject) -putObject :: StorableObjectIdent -> Maybe ProofOfWork -> Types.StorableObject -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement StoreResult) +putObject :: StorableObjectIdent -> Maybe ProofOfWork -> StorableObject -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement StoreResult) countObjects :: Maybe ProofOfWork -> Manager -> BaseUrl -> ClientM (ProofOfWorkRequirement CountResult) apiVersion :<|> motd diff --git a/HTTP/Server.hs b/HTTP/Server.hs index 1d5e145..6517897 100644 --- a/HTTP/Server.hs +++ b/HTTP/Server.hs @@ -31,7 +31,7 @@ serverState = unsafePerformIO $ ServerState runServer :: Port -> IO () runServer port = do - forkIO obscurerThread + _ <- forkIO obscurerThread run port app serverStorage :: Storage @@ -83,7 +83,7 @@ dummyShareNum = 1 obscurerThread :: IO () obscurerThread = do _ <- atomically $ takeTMVar (obscurerRequest serverState) - obscureShares serverStorage + _ <- obscureShares serverStorage putStrLn "obscured shares" threadDelay (1000000*60*30) obscurerThread |