Browse Source

Simplify datatype XmppTlsError.

master
rnons 12 years ago
parent
commit
edeadf6ef7
  1. 4
      source/Network/Xmpp/Tls.hs
  2. 4
      source/Network/Xmpp/Types.hs

4
source/Network/Xmpp/Tls.hs

@ -184,9 +184,7 @@ wrapExceptions :: IO a -> IO (Either XmppFailure a)
wrapExceptions f = Ex.catches (liftM Right $ f) wrapExceptions f = Ex.catches (liftM Right $ f)
[ Ex.Handler $ return . Left . XmppIOException [ Ex.Handler $ return . Left . XmppIOException
, Ex.Handler $ wrap . XmppTlsError , Ex.Handler $ wrap . XmppTlsError
, Ex.Handler $ wrap . XmppTlsConnectionNotEstablished , Ex.Handler $ wrap . XmppTlsException
, Ex.Handler $ wrap . XmppTlsTerminated
, Ex.Handler $ wrap . XmppTlsHandshakeFailed
, Ex.Handler $ return . Left , Ex.Handler $ return . Left
] ]
where where

4
source/Network/Xmpp/Types.hs

@ -532,9 +532,7 @@ data StreamErrorInfo = StreamErrorInfo
} deriving (Show, Eq) } deriving (Show, Eq)
data XmppTlsError = XmppTlsError TLSError data XmppTlsError = XmppTlsError TLSError
| XmppTlsConnectionNotEstablished TLSException | XmppTlsException TLSException
| XmppTlsTerminated TLSException
| XmppTlsHandshakeFailed TLSException
deriving (Show, Eq, Typeable) deriving (Show, Eq, Typeable)
-- | Signals an XMPP stream error or another unpredicted stream-related -- | Signals an XMPP stream error or another unpredicted stream-related

Loading…
Cancel
Save