eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-11-23 03:29:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix botched merge

Browse source
This commit is contained in:
Joel Stanley 2016-07-11 15:20:00 -05:00
parent 84dc076a64
commit 2c2c817ad8
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Network/GRPC/LowLevel/CompletionQueue.hs
View file

@ -166,9 +166,7 @@ serverRequestCall s cq@CompletionQueue{.. } rm =
<$> peek call <$> peek call
<*> C.getAllMetadataArray md <*> C.getAllMetadataArray md
<*> (if havePay then toBS pay else return Nothing) <*> (if havePay then toBS pay else return Nothing)
<*> liftM2 (+) (getTime Monotonic) (C.timeSpec <$> peek dead) <*> convertDeadline dead
-- gRPC gives us a deadline that is just a delta, so we convert
-- it to a proper deadline.
_ -> do _ -> do
lift $ dbug $ "Throwing callError: " ++ show ce lift $ dbug $ "Throwing callError: " ++ show ce
throwE (GRPCIOCallError ce) throwE (GRPCIOCallError ce)
@ -186,8 +184,8 @@ serverRequestCall s cq@CompletionQueue{.. } rm =
| otherwise -> Just <$> C.copyByteBufferToByteString bb | otherwise -> Just <$> C.copyByteBufferToByteString bb
convertDeadline deadline = do convertDeadline deadline = do
deadline' <- C.timeSpec <$> peek deadline deadline' <- C.timeSpec <$> peek deadline
--On OS X, gRPC gives us a deadline that is just a delta, so we -- On OS X, gRPC gives us a deadline that is just a delta, so we convert
--convert it to an actual deadline. -- it to an actual deadline.
if os == "darwin" if os == "darwin"
then do now <- getTime Monotonic then do now <- getTime Monotonic
return $ now + deadline' return $ now + deadline'