cleaner debug output

1 files changed, 12 insertions, 7 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index dd6bfb2e..36796b6e 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -30,7 +30,7 @@ import Control.Exception
 import LocalPeerCred
 import System.Posix.User
 import qualified Data.Set as Set
-import           Data.Set (Set)
+import           Data.Set as Set (Set,(\\))
 
 import ByteStringOperators
 import qualified Data.ByteString.Lazy.Char8 as L
@@ -48,15 +48,21 @@ toJabberId host (user,tty,_) =
 
 track_login :: IORef (Set L.ByteString) -> t -> IO ()
 track_login tracked e = do
-    -- print e
-    putStrLn "---"
 #ifndef NOUTMP
     us <- users
 #else
     let us = []
 #endif
-    let ids = mapMaybe (toJabberId "localhost") us
-    forM_ ids L.putStrLn
+    let ids = Set.fromList $ mapMaybe (toJabberId "localhost") us
+    -- forM_ ids L.putStrLn
+    state <- readIORef tracked
+    let arrivals   = ids \\ state
+        departures = state \\ ids
+    forM_ (Set.toList departures) $ \id -> do
+        putStrLn $ id <++> " logged out."
+    forM_ (Set.toList arrivals) $ \id -> do
+        putStrLn $ id <++> " logged in."
+    writeIORef tracked ids
 
 data UnixSession = UnixSession {
     unix_uid :: (IORef (Maybe UserID)),
@@ -101,19 +107,18 @@ start = do
     tracked <- newIORef Set.empty
     let dologin e = track_login tracked e
         dologin :: t -> IO ()
+    dologin ()
 #ifndef NOUTMP
     installHandler sigUSR1 (Catch (dologin (userError "signaled"))) Nothing
 #endif
     -- installHandler sigTERM (CatchOnce (dologin (userError "term signaled"))) Nothing
     inotify <- initINotify
-    print inotify
 #ifndef NOUTMP
     wd <- addWatch
             inotify
             [CloseWrite] -- [Open,Close,Access,Modify,Move]
             utmp_file
             dologin
-    print wd
 #endif
     mtty <- monitorTTY on_chvt
     sock <- listenForXmppClients UnixSessions 5222 HNil