cleanup debug noise

2 files changed, 33 insertions, 40 deletions

diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index ecd77dae..b544af97 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -11,7 +11,6 @@ import Data.Bits
 import Network.Socket
 import System.Posix.Types
 import Debug.Trace
--- import System.Environment (getArgs)
 
 xs     ?? n | n < 0 =  Nothing
 []     ?? _         =  Nothing
@@ -34,7 +33,8 @@ parseHex bs = L.concat . parseHex' $ bs
 
 getLocalPeerCred' (SockAddrInet portn host) = do
     let port = fromEnum portn
-    trace ("tcp4 "++show(port,host)) $ withFile "/proc/net/tcp"  ReadMode (parseProcNet port host)
+    {- trace ("tcp4 "++show(port,host)) $ -} 
+    withFile "/proc/net/tcp"  ReadMode (parseProcNet port host)
 
 getLocalPeerCred' (SockAddrInet6 portn flow host scope) = do
     let port = fromEnum portn
@@ -76,12 +76,15 @@ parseProcNet port host h = do
                           uid <- listToMaybe ys'
                           let peer = (port,decode addr)
                               user = toEnum (read (unpack uid) ::Int) ::UserID  -- CUid . fromIntegral $ (read (unpack uid)::Int)
-                          return $ trace ("peer:"++show(peer,user)) (peer,user)
+                          return $ {- trace ("peer:"++show(peer,user)) -} (peer,user)
                           )
-                    fmap snd . listToMaybe $ filter ((===(port,host)).fst) rs 
-        trace ("found:"++show u) $ u `seq` return u
+                    fmap snd . listToMaybe $ filter ((==(port,host)).fst) rs 
+        {- trace ("found: "++show u) -} 
+        u `seq` return u
+{-
  where
     a === b = let r= a==b in  trace ("Comparing "++show (a,b)++"-->"++show r) r
+-}
 
 {-
 main = do
diff --git a/Presence/main.hs b/Presence/main.hs
index 7bf9d117..cf5942df 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -46,11 +46,8 @@ import           Prelude hiding (putStrLn)
 
 -- | Jabber ID (JID) datatype
 data JID = JID { name :: Maybe ByteString
-               -- ^ Account name
                , server :: ByteString
-               -- ^ Server adress
                , resource :: Maybe ByteString
-               -- ^ Resource name
                }
  deriving (Ord,Eq)
 
@@ -60,32 +57,7 @@ instance Show JID where
 instance NFData JID where
     rnf v@(JID n s r) = n `seq` s `seq` r `seq` ()
 
-jid user host rsrc = JID (Just user) host (Just rsrc)  --  user <++> "@" <++> host <++> "/" <++> rsrc
-
-toJabberId host (user,tty,_) = 
-    if L.take 3 tty == "tty"
-      then Just (jid user host tty)
-      else Nothing
-
-track_login :: MVar (ByteString,Set JID) -> t -> IO ()
-track_login tracked e = do
-#ifndef NOUTMP
-    us <- users
-#else
-    let us = []
-#endif
-    let ids = Set.fromList $ mapMaybe (toJabberId "localhost") us
-    (tty,state) <- modifyMVar tracked $ \(tty,st) ->
-                    return ((tty,ids),(tty,st))
-    let arrivals   = ids \\ state
-        departures = state \\ ids
-    forM_ (Set.toList departures) $ \id -> do
-        putStrLn $ bshow id <++> " Offline."
-    forM_ (Set.toList arrivals) $ \jid -> do
-      case fmap (==tty) $ resource jid of
-        Just True  -> putStrLn $ bshow jid <++> " Available."
-        Just False -> putStrLn $ bshow jid <++> " Away."
-        Nothing    -> trace "Unexpected lack of resource" $ return ()
+jid user host rsrc = JID (Just user) host (Just rsrc)
 
 data UnixSession = UnixSession {
     unix_uid :: (IORef (Maybe UserID)),
@@ -122,6 +94,30 @@ instance XMPPSession UnixSession where
         return jid
     closeSession _             = L.putStrLn "SESSION: close"
 
+track_login :: MVar (ByteString,Set JID) -> t -> IO ()
+track_login tracked e = do
+#ifndef NOUTMP
+    us <- users
+#else
+    let us = []
+#endif
+    let toJabberId host (user,tty,_) = 
+            if L.take 3 tty == "tty"
+              then Just (jid user host tty)
+              else Nothing
+        ids = Set.fromList $ mapMaybe (toJabberId "localhost") us
+    (tty,state) <- modifyMVar tracked $ \(tty,st) ->
+                    return ((tty,ids),(tty,st))
+    let arrivals   = ids \\ state
+        departures = state \\ ids
+    forM_ (Set.toList departures) $ \id -> do
+        putStrLn $ bshow id <++> " Offline."
+    forM_ (Set.toList arrivals) $ \jid -> do
+      case fmap (==tty) $ resource jid of
+        Just True  -> putStrLn $ bshow jid <++> " Available."
+        Just False -> putStrLn $ bshow jid <++> " Away."
+        Nothing    -> trace "Unexpected lack of resource" $ return ()
+
 on_chvt tracked vtnum = do
     let tty = L.snoc "tty" $ intToDigit (fromIntegral vtnum)
     L.putStrLn $ "VT switch: " <++> tty
@@ -139,9 +135,7 @@ start = do
     tracked <- newMVar ("",Set.empty)
     let dologin e = track_login tracked e
         dologin :: t -> IO ()
-#ifndef NOUTMP
     installHandler sigUSR1 (Catch (dologin (userError "signaled"))) Nothing
-#endif
     -- installHandler sigTERM (CatchOnce (dologin (userError "term signaled"))) Nothing
     mtty <- monitorTTY (on_chvt tracked)
     inotify <- initINotify
@@ -158,10 +152,6 @@ start = do
     dologin ()
     putStrLn "\nHit enter to terminate...\n"
     getLine
-    {-
-    let doException (SomeException e) = Prelude.putStrLn ("\n\nexception: " ++ show e ++ "\n\n")
-    handle doException $ do
-    -}
     sClose sock
     -- threadDelay 1000
     putStrLn "closed listener."