6 files changed, 93 insertions, 93 deletions

diff --git a/Presence/FGConsole.hs b/Presence/FGConsole.hs
index c72addff..6686e19f 100644
--- a/Presence/FGConsole.hs
+++ b/Presence/FGConsole.hs
@@ -14,7 +14,7 @@ import Control.Monad
 import Foreign.C.Error
 import Foreign.C
 
-import Debug.Trace
+import Logging
 import System.Posix.Signals
 
 -- c_monitorTTY fd = trace "c_monitorTTY" (return ()) -- (trace "WTF" todo)
diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index f66421f8..e5832b47 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -17,7 +17,7 @@ import Data.Binary
 import Data.Bits
 import System.Posix.Types
 import System.Posix.Files
-import Debug.Trace
+import Logging
 import SocketLike
 import ControlMaybe
 
diff --git a/Presence/ServerC.hs b/Presence/ServerC.hs
index 02c6446e..d8cca897 100644
--- a/Presence/ServerC.hs
+++ b/Presence/ServerC.hs
@@ -12,8 +12,7 @@ module ServerC
     ) where
 
 import Network.Socket as Socket
-import Data.ByteString.Lazy.Char8 as L 
-    ( putStrLn )
+import Logging
 import Data.ByteString.Char8
     ( hGetNonBlocking
     )
@@ -97,10 +96,10 @@ doServer (HCons family port) g = runServer port (runConn g)
                   "resource exhausted" -> return Retry
 
                   -- InvalidArgument
-                  "invalid argument"   -> L.putStrLn "quit accept-loop." >> return QuitOnException
+                  "invalid argument"   -> debugL "quit accept-loop." >> return QuitOnException
 
                   _  -> do
-                    L.putStrLn ("accept-loop exception: " <++> bshow ioerror <++> "\n")
+                    debugL ("accept-loop exception: " <++> bshow ioerror <++> "\n")
                     return QuitOnException
 
             mcon <- handle doException $ fix $ \loop -> do
@@ -146,6 +145,6 @@ runConn ::
 runConn g st (sock,_) = do
         h <- socketToHandle sock ReadWriteMode
         hSetBuffering h NoBuffering
-        let doException (SomeException e) = Prelude.putStrLn ("\n\nexception: " ++ show e ++ "\n\n")
+        let doException (SomeException e) = debugStr ("\n\nexception: " ++ show e ++ "\n\n")
         handle doException (g (restrictSocket sock `HCons` st) (packets h) (packetSink h))
         hClose h
diff --git a/Presence/XMLToByteStrings.hs b/Presence/XMLToByteStrings.hs
index 92ac05cd..b15ab34a 100644
--- a/Presence/XMLToByteStrings.hs
+++ b/Presence/XMLToByteStrings.hs
@@ -13,7 +13,7 @@ import qualified Data.Conduit.List as CL
 import qualified Data.Conduit.Binary as CB
 import Data.XML.Types as XML (Event)
 import qualified Data.ByteString as S (ByteString,append)
-import qualified Data.ByteString.Char8 as S (putStrLn)
+import Logging
 #ifdef RENDERFLUSH
 import Data.Conduit.Blaze (builderToByteStringFlush)
 import Text.XML.Stream.Render (def,renderBuilderFlush,renderBytes,rsPretty)
@@ -69,4 +69,4 @@ renderChunks = fixMaybeT $  \loop -> do
 
 prettyPrint prefix xs = 
     liftIO $ do
-        CL.sourceList xs $= renderBytes (def { rsPretty=True }) =$= CB.lines $$ CL.mapM_ (S.putStrLn . (prefix `S.append`))
+        CL.sourceList xs $= renderBytes (def { rsPretty=True }) =$= CB.lines $$ CL.mapM_ (debugS . (prefix `S.append`))
diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index 378c6785..6dbc64b0 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -23,6 +23,7 @@ import ByteStringOperators
 import ControlMaybe
 import XMLToByteStrings
 import SendMessage
+import Logging
 
 import Data.Maybe (catMaybes)
 import Data.HList
@@ -31,8 +32,7 @@ import Control.Concurrent.STM
 import Data.Conduit
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as L
-    ( putStrLn
-    , fromChunks
+    ( fromChunks
     )
 import Control.Concurrent.Async
 import Control.Exception as E ( finally )
@@ -187,7 +187,7 @@ handleIQSetBind session cmdChan stanza_id = do
     rsc <- case mchild of
              Just child -> do
                 let unhandledBind = do
-                        liftIO $ putStrLn $ "unhandled-bind: "++show child
+                        liftIO $ debugStr $ "unhandled-bind: "++show child
                         return ""
                 case tagName child of
                     "{urn:ietf:params:xml:ns:xmpp-bind}resource"
@@ -196,10 +196,10 @@ handleIQSetBind session cmdChan stanza_id = do
                         return . textToByteString $ rsc
                     _ -> unhandledBind
              Nothing -> do
-                liftIO $ putStrLn $ "empty bind request!"
+                liftIO $ debugStr $ "empty bind request!"
                 return ""
     liftIO $ do
-        L.putStrLn $ "iq-set-bind-resource " <++> rsc
+        debugL $ "iq-set-bind-resource " <++> rsc
         setResource session rsc
         jid <- getJID session
         atomically $ do
@@ -229,7 +229,7 @@ handleIQSetSession session cmdChan stanza_id = do
 handleIQSet session cmdChan tag = do
     withJust (lookupAttrib "id" (tagAttrs tag)) $ \stanza_id -> do
     whenJust nextElement $ \child -> do
-    let unhandledSet = liftIO $ putStrLn ("iq-set: "++show (stanza_id,child))
+    let unhandledSet = liftIO $ debugStr ("iq-set: "++show (stanza_id,child))
     case tagName child of
       "{urn:ietf:params:xml:ns:xmpp-bind}bind" 
         -> handleIQSetBind session cmdChan stanza_id
@@ -329,10 +329,10 @@ handleIQGet session cmdChan tag = do
         names <- getNamesForPeer (peer jid)
         return (S.decodeUtf8 . head $ names)
     let unhandledGet req = do
-            liftIO $ putStrLn ("iq-get: "++show (stanza_id,child))
+            liftIO $ debugStr ("iq-get: "++show (stanza_id,child))
             liftIO . atomically . writeTChan cmdChan . Send $ iq_service_unavailable host stanza_id Nothing req
     case tagName child of
-        -- "{http://jabber.org/protocol/disco#items}query" -> liftIO $ putStrLn "iq-get-query-items"
+        -- "{http://jabber.org/protocol/disco#items}query" -> liftIO $ debugStr "iq-get-query-items"
         "{urn:xmpp:ping}ping" -> liftIO $ do
             let mjid = lookupAttrib "from" (tagAttrs tag)
             let pong = [ EventBeginElement "{jabber:client}iq" 
@@ -347,7 +347,7 @@ handleIQGet session cmdChan tag = do
                       ]
             atomically . writeTChan cmdChan . Send $ pong
         "{jabber:iq:roster}query" -> liftIO $ do
-            putStrLn $ "REQUESTED ROSTER " ++ show tag
+            debugStr $ "REQUESTED ROSTER " ++ show tag
             roster <- getRoster session stanza_id
             atomically $ do
                 writeTChan cmdChan InterestedInRoster
@@ -359,7 +359,7 @@ handleIQGet session cmdChan tag = do
 fromClient :: (MonadThrow m,MonadIO m, JabberClientSession session) => 
     session -> TChan ClientCommands -> Sink XML.Event m ()
 fromClient session cmdChan = doNestingXML $ do
-    let log  = liftIO . L.putStrLn . ("(C) " <++>)
+    let log  = liftIO . debugL . ("(C) " <++>)
         send = liftIO . atomically . writeTChan cmdChan . Send
     withXML $ \begindoc -> do
     when (begindoc==EventBeginDocument) $ do
@@ -378,7 +378,7 @@ fromClient session cmdChan = doNestingXML $ do
         whenJust nextElement $ \stanza -> do
             stanza_lvl <- nesting
 
-            liftIO . putStrLn $ "stanza: "++show stanza
+            liftIO . debugStr $ "stanza: "++show stanza
 
             let unhandledStanza = do
                     xs <- gatherElement stanza Seq.empty
@@ -443,9 +443,9 @@ toClient session pchan cmdChan rchan = toClient' False False
       CmdChan (Send xs)  -> send xs >> loop
       CmdChan BoundToResource    -> toClient' True    isInterested
       CmdChan InterestedInRoster -> do
-        liftIO . putStrLn $ "Roster: interested"
+        liftIO . debugStr $ "Roster: interested"
         toClient' isBound True
-      -- CmdChan cmd        -> liftIO (putStrLn $ "unhandled event: "++show cmd) >> loop
+      -- CmdChan cmd        -> liftIO (debugStr $ "unhandled event: "++show cmd) >> loop
       RChan   (RequestedSubscription who contact) ->  do
         jid <- liftIO $ getJID session
         when (isInterested && Just who==name jid) $ do
@@ -453,7 +453,7 @@ toClient session pchan cmdChan rchan = toClient' False False
             send r
         loop
       RChan   (NewBuddy who contact) ->  do
-        liftIO . putStrLn $ "Roster push: NewBuddy "++show (isInterested,who,contact)
+        liftIO . debugStr $ "Roster push: NewBuddy "++show (isInterested,who,contact)
         (jid,me) <- liftIO $ do
                         jid <- getJID session
                         me <- asHostNameJID jid
@@ -469,14 +469,14 @@ toClient session pchan cmdChan rchan = toClient' False False
             let f True  = "both"
                 f False = "to"
             subscription <- fmap f (liftIO $ isSubscribed session contact)
-            r <- liftIO . handleIO (\e -> putStrLn ("Roster NewBuddy error: "++show e) >> return []) $ do
+            r <- liftIO . handleIO (\e -> debugStr ("Roster NewBuddy error: "++show e) >> return []) $ do
                             rosterPush jid 
                                      (toStrict . L.decodeUtf8 $ contact) 
                                      [attr "subscription" subscription]
             send r
         loop
       RChan   (RemovedBuddy who contact) ->  do
-        liftIO . putStrLn $ "Roster push: RemovedBuddy "++show (isInterested,who,contact)
+        liftIO . debugStr $ "Roster push: RemovedBuddy "++show (isInterested,who,contact)
         (jid,me) <- liftIO $ do
                         jid <- getJID session
                         me <- asHostNameJID jid
@@ -492,14 +492,14 @@ toClient session pchan cmdChan rchan = toClient' False False
             let f True  = "from"
                 f False = "none"
             subscription <- fmap f (liftIO $ isSubscribed session contact)
-            r <- liftIO . handleIO (\e -> putStrLn ("Roster RemovedBuddy error: "++show e) >> return []) $ do
+            r <- liftIO . handleIO (\e -> debugStr ("Roster RemovedBuddy error: "++show e) >> return []) $ do
                             rosterPush jid 
                                      (toStrict . L.decodeUtf8 $ contact) 
                                      [attr "subscription" subscription]
             send r
         loop
       RChan   (NewSubscriber who contact) ->  do
-        liftIO . putStrLn $ "Roster push: NewSubscriber "++show (isInterested,who,contact)
+        liftIO . debugStr $ "Roster push: NewSubscriber "++show (isInterested,who,contact)
         (jid,me) <- liftIO $ do
                         jid <- getJID session
                         me <- asHostNameJID jid
@@ -509,14 +509,14 @@ toClient session pchan cmdChan rchan = toClient' False False
             let f True  = "both"
                 f False = "from"
             subscription <- fmap f (liftIO $ isBuddy session contact)
-            r <- liftIO . handleIO (\e -> putStrLn ("Roster NewSubscriber error: "++show e) >> return []) $ do
+            r <- liftIO . handleIO (\e -> debugStr ("Roster NewSubscriber error: "++show e) >> return []) $ do
                             rosterPush jid 
                                      (toStrict . L.decodeUtf8 $ contact) 
                                      [attr "subscription" subscription]
             send r
         loop
       RChan   (RejectSubscriber who contact) ->  do
-        liftIO . putStrLn $ "Roster push: RejectSubscriber "++show (isInterested,who,contact)
+        liftIO . debugStr $ "Roster push: RejectSubscriber "++show (isInterested,who,contact)
         (jid,me) <- liftIO $ do
                         jid <- getJID session
                         me <- asHostNameJID jid
@@ -526,14 +526,14 @@ toClient session pchan cmdChan rchan = toClient' False False
             let f True  = "to"
                 f False = "none"
             subscription <- fmap f (liftIO $ isBuddy session contact)
-            r <- liftIO . handleIO (\e -> putStrLn ("Roster RejectSubscriber error: "++show e) >> return []) $ do
+            r <- liftIO . handleIO (\e -> debugStr ("Roster RejectSubscriber error: "++show e) >> return []) $ do
                             rosterPush jid 
                                      (toStrict . L.decodeUtf8 $ contact) 
                                      [attr "subscription" subscription]
             send r
         loop
       RChan   (PendingSubscriber who contact) ->  do
-        liftIO . putStrLn $ "Roster: Pending buddy "++show (isInterested,who,contact)
+        liftIO . debugStr $ "Roster: Pending buddy "++show (isInterested,who,contact)
         (jid,me) <- liftIO $ do
                         jid <- getJID session
                         me <- asHostNameJID jid
@@ -563,7 +563,7 @@ handleClient st src snk = do
         session_factory = hHead st'
     pname <- getPeerName sock
     session <- newSession session_factory sock
-    Prelude.putStrLn $ "PEER NAME: "++Prelude.show pname
+    debugStr $ "PEER NAME: "++Prelude.show pname
     pchan <- subscribe session Nothing
     rchan <- subscribeToRoster session
     let cmdChan = clientChannel session
@@ -599,12 +599,12 @@ handlePeer st src snk = do
     let HCons sock (HCons _ st') = st
         session_factory = hHead st'
     name <- fmap bshow $ getPeerName sock
-    L.putStrLn $ "(P) connected " <++> name
+    debugL $ "(P) connected " <++> name
     session <- newPeerSession session_factory sock
 
     finally ( src $= parseBytes def $$ fromPeer session )
         $ do 
-            L.putStrLn $ "(P) disconnected " <++> name
+            debugL $ "(P) disconnected " <++> name
             closePeerSession session
 
 
@@ -615,7 +615,7 @@ handlePeerPresence session stanza False = do
     liftIO $ announcePresence session (Presence peer_jid Offline)
 handlePeerPresence session stanza True = do
     -- online (Available or Away)
-    let log  = liftIO . L.putStrLn . ("(P) " <++>)
+    let log  = liftIO . debugL . ("(P) " <++>)
     withJust (lookupAttrib "from" (tagAttrs stanza)) $ \jid -> do
     pjid <- liftIO $ parseAddressJID (textToByteString jid)
     -- stat <- show element content
@@ -671,15 +671,15 @@ handlePresenceProbe session stanza = do
     -- withJust (lookupAttrib "from" (tagAttrs stanza)) $ \from -> do
     jid <- liftIO $ parseAddressJID $ textToByteString to
     withJust (name jid) $ \user -> do
-    liftIO $ L.putStrLn $ "RECEIVED PROBE "<++>bshow (peerAddress session,to)
+    liftIO $ debugL $ "RECEIVED PROBE "<++>bshow (peerAddress session,to)
     liftIO $ do
         subs <- getSubscribers (peerSessionFactory session) user
-        liftIO $ L.putStrLn $ "subscribers for "<++>bshow user<++>": " <++>bshow subs
+        liftIO $ debugL $ "subscribers for "<++>bshow user<++>": " <++>bshow subs
         forM_ subs $ \jidstr -> do
             handleIO_ (return ()) $ do
-                L.putStrLn $ "parsing " <++>jidstr
+                debugL $ "parsing " <++>jidstr
                 sub <- parseHostNameJID jidstr
-                putStrLn $ "comparing " ++show (peer sub , peerAddress session)
+                debugStr $ "comparing " ++show (peer sub , peerAddress session)
                 when (peer sub == discardPort (peerAddress session)) $ do
                 ps <- userStatus session user
                 -- todo: Consider making this a directed presence
@@ -719,24 +719,24 @@ presenceSubscribed from = return
 
 clientRequestsSubscription session cmdChan stanza = do
     liftIO $ do
-        putStrLn $ "CLIENT PRESENCE SUBSCRIBE " ++ show stanza
+        debugStr $ "CLIENT PRESENCE SUBSCRIBE " ++ show stanza
         withJust (lookupAttrib "to" (tagAttrs stanza)) $ \to_str0 -> do
         let to_str = S.takeWhile (/='/') to_str0
             from = lookupAttrib "from" (tagAttrs stanza)
             iqid = lookupAttrib "id" (tagAttrs stanza)
         let handleError e | isDoesNotExistError e = do
-                putStrLn $ "remote-server-not-found"
+                debugStr $ "remote-server-not-found"
                 r <- presenceErrorRemoteNotFound iqid from to_str
                 atomically $ writeTChan cmdChan (Send r)
             handleError e = do
-                putStrLn $ "ERROR: "++ show e
+                debugStr $ "ERROR: "++ show e
         handleIO handleError $ do
             let to_str' = textToByteString to_str
             to_jid <- fmap bare $ parseHostNameJID to_str'
             if (is_remote . peer) to_jid 
              then do
                 addSolicited session to_str' to_jid
-                putStrLn $ "added to solicited: " ++ show to_jid
+                debugStr $ "added to solicited: " ++ show to_jid
              else do
                 -- addLocalSubscriber session to_str
                 -- self <- getJID session
@@ -763,9 +763,9 @@ stanzaFromTo session stanza =
                     return $ Just (fromjid,to)
 
 peerRequestsSubsription session stanza = do
-    liftIO $ putStrLn $ "PEER PRESENCE SUBSCRIBE " ++ show stanza
+    liftIO $ debugStr $ "PEER PRESENCE SUBSCRIBE " ++ show stanza
 
-    whenJust (liftIO . handleIO (\e -> putStrLn ("peerRequestsSubsription: "++show e) >> return Nothing) 
+    whenJust (liftIO . handleIO (\e -> debugStr ("peerRequestsSubsription: "++show e) >> return Nothing) 
                 $ stanzaFromTo session stanza) $ \(fromjid,tojid) -> do
     withJust (name tojid) $ \user -> do
 
@@ -777,7 +777,7 @@ peerRequestsSubsription session stanza = do
              return (catMaybes msubs)
     if elem fromjid subs
       then do
-        liftIO . L.putStrLn $ bshow fromjid <++> " already subscribed to " <++> user
+        liftIO . debugL $ bshow fromjid <++> " already subscribed to " <++> user
         -- if already subscribed, reply
         liftIO $ do
              sendPeerMessage session (Approval tojid fromjid)
@@ -788,25 +788,25 @@ peerRequestsSubsription session stanza = do
         liftIO $ processRequest session user fromjid
 
 clientApprovesSubscription session stanza = do
-    liftIO $ putStrLn $ "CLIENT APPROVES SUBSCRIPTION"
+    liftIO $ debugStr $ "CLIENT APPROVES SUBSCRIPTION"
     withJust (lookupAttrib "to" (tagAttrs stanza)) $ \to_str -> do
     liftIO $ approveSubscriber session (textToByteString to_str)
 
 clientRejectsSubscription session stanza = do
-    liftIO $ putStrLn $ "CLIENT REJECTS SUBSCRIPTION"
+    liftIO $ debugStr $ "CLIENT REJECTS SUBSCRIPTION"
     withJust (lookupAttrib "to" (tagAttrs stanza)) $ \to_str -> do
     liftIO $ rejectSubscriber session (textToByteString to_str)
 
 peerApprovesSubscription session stanza = do
-    liftIO $ putStrLn $ "PEER APPROVES SUBSCRIPTION"
-    whenJust (liftIO . handleIO (\e -> putStrLn ("peerApprovesSubscription: "++show e) >> return Nothing) 
+    liftIO $ debugStr $ "PEER APPROVES SUBSCRIPTION"
+    whenJust (liftIO . handleIO (\e -> debugStr ("peerApprovesSubscription: "++show e) >> return Nothing) 
              $ stanzaFromTo session stanza) $ \(fromjid,tojid) -> do
     withJust (name tojid) $ \user -> do
     liftIO $ processApproval session user fromjid
 
 peerRejectsSubscription session stanza = do
-    liftIO $ putStrLn $ "PEER REJECTS SUBSCRIPTION"
-    whenJust (liftIO . handleIO (\e -> putStrLn ("peerRejectsSubscription: "++show e) >> return Nothing) 
+    liftIO $ debugStr $ "PEER REJECTS SUBSCRIPTION"
+    whenJust (liftIO . handleIO (\e -> debugStr ("peerRejectsSubscription: "++show e) >> return Nothing) 
              $ stanzaFromTo session stanza) $ \(fromjid,tojid) -> do
     withJust (name tojid) $ \user -> do
     liftIO $ processRejection session user fromjid
@@ -814,7 +814,7 @@ peerRejectsSubscription session stanza = do
 fromPeer :: (MonadThrow m,MonadIO m, JabberPeerSession session) => 
     session -> Sink XML.Event m ()
 fromPeer session = doNestingXML $ do
-    let log  = liftIO . L.putStrLn . ("(P) " <++>)
+    let log  = liftIO . debugL . ("(P) " <++>)
     withXML $ \begindoc -> do
     when (begindoc==EventBeginDocument) $ do
     log "begin-doc"
@@ -927,7 +927,7 @@ toPeer
      -> (Maybe OutBoundMessage -> IO ())
      -> ConduitM i [Event] IO ()
 toPeer sock cache chan fail = do
-    let -- log     = liftIO . L.putStrLn . ("(>P) " <++>)
+    let -- log     = liftIO . debugL . ("(>P) " <++>)
         send xs = yield xs >> prettyPrint ">P: " xs -- >> return (3::Int)
         checkConnection cmd = do
             liftIO $ catchIO (getPeerName sock >> return ())
@@ -935,7 +935,7 @@ toPeer sock cache chan fail = do
         sendOrFail getXML cmd = do
             checkConnection cmd
             r <- liftIO $ getXML
-                    -- handleIO (\e -> putStrLn ("ERROR: "++show e) >> return []) getXML
+                    -- handleIO (\e -> debugStr ("ERROR: "++show e) >> return []) getXML
             yieldOr r (fail . Just $ cmd)
             prettyPrint ">P: " r
         sendPresence presence =
@@ -957,7 +957,7 @@ toPeer sock cache chan fail = do
     send greetPeer
     forM_ (Map.assocs . approvals $ cache) $ \(to,froms) -> do
         forM_ (Set.toList froms) $ \(approve,from) -> do
-            liftIO $ L.putStrLn "sending cached approval..."
+            liftIO $ debugL "sending cached approval..."
             sendApproval approve from to
     forM_ (Map.assocs . presences $ cache) $ \(jid,st) -> do
         sendPresence (Presence jid st)
@@ -965,10 +965,10 @@ toPeer sock cache chan fail = do
         forM_ (Set.toList froms) $ \(got,from) -> do
             if got 
               then do
-                    liftIO $ L.putStrLn "sending cached probe..."
+                    liftIO $ debugL "sending cached probe..."
                     sendProbe from to
               else do
-                    liftIO $ L.putStrLn "sending cached solicitation..."
+                    liftIO $ debugL "sending cached solicitation..."
                     sendSolicitation from to
 
                     
@@ -977,16 +977,16 @@ toPeer sock cache chan fail = do
         case event of
           OutBoundPresence p    -> sendPresence p
           PresenceProbe from to -> do
-            liftIO $ L.putStrLn "sending live probe..."
+            liftIO $ debugL "sending live probe..."
             sendProbe from to
           Solicitation from to -> do
-            liftIO $ L.putStrLn "sending live solicitation..."
+            liftIO $ debugL "sending live solicitation..."
             sendSolicitation from to
           Approval from to -> do
-            liftIO . L.putStrLn $ "sending approval "<++>bshow (from,to)
+            liftIO . debugL $ "sending approval "<++>bshow (from,to)
             sendApproval True from to
           Rejection from to -> do
-            liftIO . L.putStrLn $ "sending rejection "<++>bshow (from,to)
+            liftIO . debugL $ "sending rejection "<++>bshow (from,to)
             sendApproval False from to
         loop
     send goodbyePeer
@@ -1001,13 +1001,13 @@ seekRemotePeers config chan server_connections = do
         event <- atomically $ readTChan chan
         case event of
             p@(Presence jid stat) | not (is_remote (peer jid)) -> do
-              -- L.putStrLn $ "seekRemotePeers: " <++> L.show jid <++> " " <++> bshow stat
+              -- debugL $ "seekRemotePeers: " <++> L.show jid <++> " " <++> bshow stat
               runMaybeT $ do
                   u <- MaybeT . return $ name jid
                   subscribers <- liftIO $ do
                     subs <- getSubscribers config u
                     mapM parseHostNameJID subs
-                  -- liftIO . L.putStrLn $ "subscribers: " <++> bshow subscribers
+                  -- liftIO . debugL $ "subscribers: " <++> bshow subscribers
                   let peers = Set.map peer (Set.fromList subscribers)
                   forM_ (Set.toList peers) $ \peer -> do
                     when (is_remote peer) $
diff --git a/Presence/main.hs b/Presence/main.hs
index 83f11df3..ef6a0e66 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -31,6 +31,7 @@ import Data.HList
 import Control.Exception hiding (catch)
 import LocalPeerCred
 import System.Posix.User
+import Logging
 import qualified Data.Set as Set
 import           Data.Set as Set (Set,(\\))
 import qualified Data.Map as Map
@@ -43,7 +44,7 @@ import Control.Monad.IO.Class
 
 import ByteStringOperators
 import qualified Data.ByteString.Lazy.Char8 as L
-import           Data.ByteString.Lazy.Char8 as L (ByteString,putStrLn)
+import           Data.ByteString.Lazy.Char8 as L (ByteString)
 import qualified Prelude
 import           Prelude hiding (putStrLn)
 import System.Environment
@@ -149,7 +150,7 @@ instance JabberClientSession ClientSession where
         -- muid <- getLocalPeerCred sock
         addr <- getPeerName sock
         muid <- getLocalPeerCred' addr
-        L.putStrLn $ "CLIENT SESSION: open " <++> bshow muid
+        debugL $ "CLIENT SESSION: open " <++> bshow muid
         uid_ref <- newIORef muid
         (mtty,pid) <- getTTYandPID muid
         res_ref <- newIORef mtty
@@ -171,7 +172,7 @@ instance JabberClientSession ClientSession where
         rsc <- readIORef (unix_resource s)
         let rsc' = maybe wanted_resource id rsc
         writeIORef (unix_resource s) (Just rsc')
-        L.putStrLn $ "CLIENT SESSION: resource " <++> rsc'
+        debugL $ "CLIENT SESSION: resource " <++> rsc'
 
     getJID       s             = do
         let host = localhost s
@@ -179,7 +180,7 @@ instance JabberClientSession ClientSession where
 
         rsc <- readIORef (unix_resource s)
         -- let jid = user <++> "@" <++> host <++?> "/" <++$> rsc
-        -- L.putStrLn $ "CLIENT SESSION: jid " <++> L.show (JID (Just user) host rsc)
+        -- debugL $ "CLIENT SESSION: jid " <++> L.show (JID (Just user) host rsc)
         return (JID (Just user) host rsc)
 
     closeSession session  = do
@@ -187,7 +188,7 @@ instance JabberClientSession ClientSession where
             cs <- readTVar (chans session)
             forM_ cs $ \(RefCountedChan c) -> do
                 unsubscribeToChan c
-        L.putStrLn "CLIENT SESSION: close"
+        debugL "CLIENT SESSION: close"
 
     subscribe session Nothing = do
         let tmvar = localSubscriber (presence_state session)
@@ -210,7 +211,7 @@ instance JabberClientSession ClientSession where
 
     forCachedPresence s action = do
         jid <- getJID s 
-        L.putStrLn $ "forCachedPresence "<++> bshow jid
+        debugL $ "forCachedPresence "<++> bshow jid
         withJust (name jid) $ \user -> do
         let parseHostNameJID' str = do
                 handle (\(SomeException _) -> return Nothing)
@@ -220,19 +221,19 @@ instance JabberClientSession ClientSession where
             fmap catMaybes (mapM parseHostNameJID' buddies)
         remotes <- readTVarIO . remoteUsers . presence_state $ s
         forM_ buddies $ \buddy -> do
-            L.putStrLn $ "forCachedPresence buddy = "<++> bshow buddy
+            debugL $ "forCachedPresence buddy = "<++> bshow buddy
             let mjids = fmap snd $ Map.lookup (peer buddy) remotes
             jids <- maybe (return MM.empty) readTVarIO mjids
-            L.putStrLn $ "forCachedPresence jids = "<++> bshow jids
+            debugL $ "forCachedPresence jids = "<++> bshow jids
             withJust (splitResource buddy) $ \(buddyU,_) -> do
             forM_ (Set.toList . MM.lookup buddyU $ jids) $ \(rsc,status) -> do
             let p = Presence buddy status
-            L.putStrLn $ "cached presence: " <++> bshow p
+            debugL $ "cached presence: " <++> bshow p
             action p
 
     sendPending s = do
         jid <- getJID s 
-        putStrLn $ "sendPending "<++> bshow jid
+        debugL $ "sendPending "<++> bshow jid
         flip (maybe (return ())) (name jid) $ \user -> do
         pending <- ConfigFiles.getPending user
         let getRChan = do
@@ -279,7 +280,7 @@ instance JabberClientSession ClientSession where
         handleIO (\e -> return False) $ do
         user <- readIORef (unix_uid s) >>= getJabberUserForId
         subs <- ConfigFiles.getSubscribers user
-        putStrLn $ "isSubscribed parsing: "<++>contact
+        debugL $ "isSubscribed parsing: "<++>contact
         cjid <- parseHostNameJID contact
         msubs <- mapM (cmpJID cjid) subs
         return (Nothing `elem` msubs)
@@ -288,7 +289,7 @@ instance JabberClientSession ClientSession where
         handleIO (\e -> return False) $ do
         user <- readIORef (unix_uid s) >>= getJabberUserForId
         subs <- ConfigFiles.getBuddies user
-        putStrLn $ "isBuddy parsing: "<++>contact
+        debugL $ "isBuddy parsing: "<++>contact
         cjid <- parseHostNameJID contact
         msubs <- mapM (cmpJID cjid) subs
         return (Nothing `elem` msubs)
@@ -369,13 +370,13 @@ instance JabberPeerSession PeerSession where
 
     newPeerSession (PeerSessions state) sock = do
         me <- fmap (RemotePeer . withoutPort) (getPeerName sock)
-        L.putStrLn $ "PEER SESSION: open "<++>showPeer me
+        debugL $ "PEER SESSION: open "<++>showPeer me
         let remotes = remoteUsers state
         jids <- atomically $ getRefFromMap remotes me (newTVar MM.empty) return
         return $ PeerSession jids me state
 
     closePeerSession session  = do
-        L.putStrLn $ "PEER SESSION: close "<++>showPeer (peer_name session)
+        debugL $ "PEER SESSION: close "<++>showPeer (peer_name session)
         let offline jid = Presence jid Offline
         unrefFromMap (remoteUsers . peer_global $ session) (peer_name session)
             $ do
@@ -409,7 +410,7 @@ instance JabberPeerSession PeerSession where
 
     sendPeerMessage session msg = do
         let cons = remotePeers . peer_global $ session
-        putStrLn $ "sendPeerMessage " <++> bshow msg <++> " --> "<++>bshow (peer_name session)
+        debugL $ "sendPeerMessage " <++> bshow msg <++> " --> "<++>bshow (peer_name session)
         sendMessage cons msg (peer_name session)
 
     getBuddies     _ user = ConfigFiles.getBuddies user
@@ -442,7 +443,7 @@ instance JabberPeerSession PeerSession where
                 hbuddy <- asHostNameJID buddy
                 modify user (cmpJID buddy) hbuddy
         was_pending <- addjid ConfigFiles.modifyPending user buddy
-        putStrLn $ "processRequest was_pending="<++>bshow was_pending
+        debugL $ "processRequest was_pending="<++>bshow was_pending
         --    "all available resources in accordence with section 8"
         --    Section 8 says (for presence of type "subscribe", the server MUST
         --    adhere to the rules defined under Section 3 and summarized under
@@ -492,7 +493,7 @@ getJabberUserForId muid =
                    muid
 
 cmpJID newitem jid = do
-    -- putStrLn $ "Comparing "<++>bshow jid
+    -- debugL $ "Comparing "<++>bshow jid
     olditem <- parseHostNameJID jid
     if olditem==newitem then return Nothing
                         else return $ Just jid
@@ -505,7 +506,7 @@ addRawJid modify user jid = do
 
 addJid modify user jid = do
     hjid <- asHostNameJID jid
-    putStrLn $ "addJid (asHostNameJID) --> "<++>bshow hjid
+    debugL $ "addJid (asHostNameJID) --> "<++>bshow hjid
     withJust hjid $ \hjid -> do
     modify user (cmpJID jid) (Just hjid)
     return ()
@@ -598,10 +599,10 @@ update_presence locals_greedy subscribers state getStatus =
       runMaybeT $ do
         chan <- MaybeT . return $ locals_greedy
         sendPresence chan jid status
-      putStrLn $ bshow jid <++> " " <++> bshow status
+      debugL $ bshow jid <++> " " <++> bshow status
 
 sendProbes state jid = do
-    L.putStrLn $ "sending probes for " <++> bshow jid
+    debugL $ "sending probes for " <++> bshow jid
     withJust (name jid) $ \user -> do
     let parseHostNameJID' str = do
             handle (\(SomeException _) -> return Nothing)
@@ -609,7 +610,7 @@ sendProbes state jid = do
     buddies <- do
         buddies <- ConfigFiles.getBuddies user
         fmap catMaybes (mapM parseHostNameJID' buddies)
-    L.putStrLn $ "buddies for " <++> bshow jid <++> " = " <++> bshow buddies
+    debugL $ "buddies for " <++> bshow jid <++> " = " <++> bshow buddies
     wanted <- do
         wanted <- ConfigFiles.getSolicited user
         fmap catMaybes (mapM parseHostNameJID' wanted)
@@ -621,7 +622,7 @@ sendProbes state jid = do
         let noinfo = not (MM.member buddyU jids)
         when noinfo $ do
         let msg = if got then PresenceProbe jid buddy else Solicitation jid buddy
-        L.putStrLn $ "sendMessage " <++> bshow msg
+        debugL $ "sendMessage " <++> bshow msg
         sendMessage (remotePeers state) msg (peer buddy) 
 
 
@@ -651,7 +652,7 @@ track_login host state e = do
 
 on_chvt state vtnum = do
     let tty = L.snoc "tty" $ intToDigit (fromIntegral vtnum)
-    L.putStrLn $ "VT switch: " <++> tty
+    debugL $ "VT switch: " <++> tty
     (users,subs,locals_greedy) <- atomically $ do
         us   <- readTVar $ activeUsers state
         subs <- readTVar $ subscriberMap state
@@ -694,19 +695,19 @@ start ip4or6 = do
 
     threadDelay 1000 -- wait a moment to obtain current tty
     dologin ()
-    putStrLn "\nHit enter to terminate...\n"
+    L.putStrLn "\nHit enter to terminate...\n"
     getLine
     killThread remotes
     quitListening clients
     quitListening peers
     -- threadDelay 1000
-    putStrLn "closed listener."
+    debugL "closed listener."
     unmonitorTTY mtty
-    putStrLn "unhooked tty monitor."
+    debugL "unhooked tty monitor."
 #ifndef NOUTMP
     removeWatch wd
 #endif
-    putStrLn "Normal termination."
+    debugL "Normal termination."
 
 sendUSR1 pid = do
     signalProcess sigUSR1 pid
@@ -721,11 +722,11 @@ getStartupAction (p:ps) = do
  where
     onEr (SomeException _) = do
         pid <- getProcessID
-        putStrLn $ "starting pid = " <++> bshow pid
+        debugL $ "starting pid = " <++> bshow pid
         handle (\(SomeException _) -> getStartupAction ps)
             (do 
                 writeFile p (show pid)
-                putStrLn $ "writing " <++> bshow p
+                debugL $ "writing " <++> bshow p
                 -- start daemon
                 return (Right p) )