summaryrefslogtreecommitdiff
path: root/Presence/main.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Presence/main.hs')
-rw-r--r--Presence/main.hs20
1 files changed, 12 insertions, 8 deletions
diff --git a/Presence/main.hs b/Presence/main.hs
index f0bc39f5..dd6bfb2e 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -28,11 +28,15 @@ import Data.HList
28import Network.Socket (sClose) 28import Network.Socket (sClose)
29import Control.Exception 29import Control.Exception
30import LocalPeerCred 30import LocalPeerCred
31import ByteStringOperators
32import qualified Data.ByteString.Lazy.Char8 as L
33import System.Posix.User 31import System.Posix.User
34import qualified Data.Set as Set 32import qualified Data.Set as Set
35import Data.Set (Set) 33import Data.Set (Set)
34
35import ByteStringOperators
36import qualified Data.ByteString.Lazy.Char8 as L
37import Data.ByteString.Lazy.Char8 as L (putStrLn)
38import qualified Prelude
39import Prelude hiding (putStrLn)
36 40
37 41
38jid user host rsrc = user <++> "@" <++> host <++> "/" <++> rsrc 42jid user host rsrc = user <++> "@" <++> host <++> "/" <++> rsrc
@@ -63,7 +67,7 @@ instance XMPPSession UnixSession where
63 data XMPPClass UnixSession = UnixSessions 67 data XMPPClass UnixSession = UnixSessions
64 newSession _ sock handle = do 68 newSession _ sock handle = do
65 muid <- getLocalPeerCred sock 69 muid <- getLocalPeerCred sock
66 putStrLn $ "SESSION: open " ++ show muid 70 L.putStrLn $ "SESSION: open " <++> bshow muid
67 uid_ref <- newIORef muid 71 uid_ref <- newIORef muid
68 res_ref <- newIORef Nothing 72 res_ref <- newIORef Nothing
69 return $ UnixSession uid_ref res_ref 73 return $ UnixSession uid_ref res_ref
@@ -87,10 +91,10 @@ instance XMPPSession UnixSession where
87 jid = user <++> "@" <++> L.pack host <++> suf 91 jid = user <++> "@" <++> L.pack host <++> suf
88 L.putStrLn $ "SESSION: jid " <++> jid 92 L.putStrLn $ "SESSION: jid " <++> jid
89 return jid 93 return jid
90 closeSession _ = putStrLn "SESSION: close" 94 closeSession _ = L.putStrLn "SESSION: close"
91 95
92on_chvt vtnum = do 96on_chvt vtnum = do
93 putStrLn $ "changed vt to "++ show vtnum 97 L.putStrLn $ "changed vt to " <++> bshow vtnum
94 98
95start :: IO () 99start :: IO ()
96start = do 100start = do
@@ -142,11 +146,11 @@ getStartupAction (p:ps) = do
142 where 146 where
143 onEr (SomeException _) = do 147 onEr (SomeException _) = do
144 pid <- getProcessID 148 pid <- getProcessID
145 putStrLn $ "starting pid = "++show pid 149 putStrLn $ "starting pid = " <++> bshow pid
146 handle (\(SomeException _) -> getStartupAction ps) 150 handle (\(SomeException _) -> getStartupAction ps)
147 (do 151 (do
148 writeFile p (show pid) 152 writeFile p (show pid)
149 putStrLn $ "writing "++show p 153 putStrLn $ "writing " <++> bshow p
150 -- start daemon 154 -- start daemon
151 return (Right p) ) 155 return (Right p) )
152 156