a057e3e · distributed-process

git.iko.soy/distributed-process

on master help sign in

revert d225580 (better ProcessExitException show)

a057e3eTim Watson14 years ago

distributed-process/src/Control/Distributed/Process/Internal/Types.hs+2−10

compare with master

unifiedsplit

@@ -73,7 +73,7 @@ import System.Mem.Weak (Weak)

73import Data.Map (Map)

74import Data.Int (Int32)

75import Data.Typeable (Typeable)

76−import Data.Binary (Binary(put, get), putWord8, getWord8, encode, decode)

76+import Data.Binary (Binary(put, get), putWord8, getWord8, encode)

77import qualified Data.ByteString as BSS (ByteString, concat, copy)

78import qualified Data.ByteString.Lazy as BSL

79 ( ByteString

@@ -378,15 +378,7 @@ data ProcessExitException =

378

379instance Exception ProcessExitException

380instance Show ProcessExitException where

381− show = showProcessExit

382−

383−showProcessExit :: ProcessExitException -> String

384−showProcessExit (ProcessExitException pid reason) =

381+ show (ProcessExitException pid _) = "exit-from=" ++ (show pid)

385− case messageFingerprint reason == fingerprint (undefined :: String) of

386− True -> "origin=" ++ (show pid) ++ ",reason=" ++ decoded

387− False -> "origin=" ++ show pid

388− where decoded :: String

389− !decoded = decode (messageEncoding reason)

390

382

391instance Exception ProcessLinkException

383instance Exception ProcessLinkException

392instance Exception NodeLinkException

384instance Exception NodeLinkException

distributed-process/tests/TestCH.hs+1−2

@@ -1047,8 +1047,7 @@ testPrettyExit transport = do

1047 _ <- forkProcess localNode $ do

1048 (die "timeout")

1049 `catch` \ex@(ProcessExitException from _) ->

1050− let expected = "origin=" ++ (show from) ++

1050+ let expected = "exit-from=" ++ (show from)

1051− ",reason=timeout"

1052 in do

1051 in do

1053 True <- return $ (show ex) == expected

1052 True <- return $ (show ex) == expected

1054 liftIO $ putMVar done ()

1053 liftIO $ putMVar done ()