From dcd64ce2c9cb6f9acb793e3f52b4dac11745949b Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Fri, 8 Mar 2013 22:00:39 +0100 Subject: [PATCH] update EchoClient --- examples/echoclient/EchoClient.hs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/examples/echoclient/EchoClient.hs b/examples/echoclient/EchoClient.hs index e69be62..f28ba28 100644 --- a/examples/echoclient/EchoClient.hs +++ b/examples/echoclient/EchoClient.hs @@ -17,25 +17,29 @@ module Main where import Control.Concurrent import Control.Monad +import Data.Default import Data.Maybe (fromJust) import qualified Data.Text as Text import Text.Printf -import Network.TLS import Network.Xmpp import Network.Xmpp.IM -import System.IO (stderr) -import System.Log.Formatter +-- import System.Log.Formatter import System.Log.Handler hiding (setLevel) import System.Log.Handler.Simple import System.Log.Logger +-- import Network.Xmpp.IM.Roster + -- Server and authentication details. -realm = fromJust $ hostname "species64739.dyndns.org" +realm = "species64739.dyndns.org" username = "echo" password = "pwd" resource = Just "bot" +config = def{srvOverrideDetails = Just ( fromJust $ hostname "127.0.0.1" + , 5222) } + -- | Automatically accept all subscription requests from other entities autoAccept :: Session -> IO () autoAccept session = forever $ do @@ -50,13 +54,14 @@ autoAccept session = forever $ do main :: IO () main = do updateGlobalLogger "Pontarius.Xmpp" $ setLevel DEBUG - handler <- streamHandler stderr DEBUG >>= \h -> - return $ setFormatter h (simpleLogFormatter "$time - $loggername: $prio: $msg") - updateGlobalLogger "Pontarius.Xmpp" (addHandler handler) + -- handler <- streamHandler stderr DEBUG >>= \h -> + -- return $ setFormatter h (simpleLogFormatter "$loggername: $msg") + -- updateGlobalLogger "Pontarius.Xmpp" (addHandler handler) sess' <- session realm - Nothing -- (Just defaultParamsClient) + config + Nothing -- (Just exampleParams) (Just ([scramSha1 username Nothing password], resource)) sess <- case sess' of Left err -> error $ "Error connection to XMPP server: " ++ show err