diff options
-rw-r--r-- | Presence/ByteStringOperators.hs | 2 | ||||
-rw-r--r-- | Presence/main.hs | 20 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Presence/ByteStringOperators.hs b/Presence/ByteStringOperators.hs index 8ecb214b..26b64bcf 100644 --- a/Presence/ByteStringOperators.hs +++ b/Presence/ByteStringOperators.hs | |||
@@ -16,3 +16,5 @@ infixr 5 <.++> | |||
16 | infixr 5 <++> | 16 | infixr 5 <++> |
17 | infixr 5 <++.> | 17 | infixr 5 <++.> |
18 | 18 | ||
19 | bshow :: Show a => a -> ByteString | ||
20 | bshow = L.pack . show | ||
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 | |||
28 | import Network.Socket (sClose) | 28 | import Network.Socket (sClose) |
29 | import Control.Exception | 29 | import Control.Exception |
30 | import LocalPeerCred | 30 | import LocalPeerCred |
31 | import ByteStringOperators | ||
32 | import qualified Data.ByteString.Lazy.Char8 as L | ||
33 | import System.Posix.User | 31 | import System.Posix.User |
34 | import qualified Data.Set as Set | 32 | import qualified Data.Set as Set |
35 | import Data.Set (Set) | 33 | import Data.Set (Set) |
34 | |||
35 | import ByteStringOperators | ||
36 | import qualified Data.ByteString.Lazy.Char8 as L | ||
37 | import Data.ByteString.Lazy.Char8 as L (putStrLn) | ||
38 | import qualified Prelude | ||
39 | import Prelude hiding (putStrLn) | ||
36 | 40 | ||
37 | 41 | ||
38 | jid user host rsrc = user <++> "@" <++> host <++> "/" <++> rsrc | 42 | jid 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 | ||
92 | on_chvt vtnum = do | 96 | on_chvt vtnum = do |
93 | putStrLn $ "changed vt to "++ show vtnum | 97 | L.putStrLn $ "changed vt to " <++> bshow vtnum |
94 | 98 | ||
95 | start :: IO () | 99 | start :: IO () |
96 | start = do | 100 | start = 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 | ||