More DPut stuff

        * verbose/quiet without args shows report
        * verbose all - sets all tags verbose
        * quiet all - sets all tags quiet
        * XMisc defaults to verbose, everything else quiet
        * new XMan tag for ToxManager related stuff
        * s/hputStrLn stderr/dput XMisc/ in daemon code

1 files changed, 5 insertions, 4 deletions

diff --git a/Connection/Tox.hs b/Connection/Tox.hs
index 03ffbc25..1cbbdaee 100644
--- a/Connection/Tox.hs
+++ b/Connection/Tox.hs
@@ -31,6 +31,7 @@ import GHC.Conc                  (labelThread)
 #endif
 import GHC.Conc (ThreadStatus (..), threadStatus)
 import System.IO
+import DPut
 
 
 
@@ -81,7 +82,7 @@ launch lbl st f = do
     tid <- forkIO (f stvar)
     labelThread tid lbl
     stat <- threadStatus tid
-    hPutStrLn stderr $ "launch "++lbl++" "++show stat
+    dput XMan $ "launch "++lbl++" "++show stat
     return $ StatefulTask tid stvar
 
 
@@ -142,12 +143,12 @@ setToxPolicy :: Parameters extra
              -> Policy
              -> IO ()
 setToxPolicy params conmap k@(Key me them) policy = do
-  hPutStrLn stderr $ "C.setToxPolicy "++show (them,policy)
+  dput XMan $ "C.setToxPolicy "++show (them,policy)
   case policy of
     TryingToConnect -> do
         mst <- lookupForPolicyChange conmap k policy
         r <- atomically $ lookupContact k (roster params)
-        hPutStrLn stderr $ "C.r="++show (fmap (const ()) r)
+        dput XMan $ "C.r="++show (fmap (const ()) r)
         forM_ r $ \(sec,c) -> do
         let persue_methods = PersueContactMethods
                 { allsessions        = sessions params
@@ -178,7 +179,7 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 fmap (fromMaybe G.Dormant) $ forM (Map.lookup (id2key them) sbk) $ \ss -> do
                     stats <- mapM (readTVar . ncState) ss
                     return $ maximum stats
-        hPutStrLn stderr $ "C.mst="++show (fmap (const ()) mst)
+        dput XMan $ "C.mst="++show (fmap (const ()) mst)
         forM_ mst $ \st -> do
             let getPolicy = readTVar $ connPolicy st
             tasks <- atomically $ readTVar (handshakeTask st)