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, 15 insertions, 1 deletions

diff --git a/src/DPut.hs b/src/DPut.hs
index b305a581..ff828112 100644
--- a/src/DPut.hs
+++ b/src/DPut.hs
@@ -6,8 +6,12 @@ import System.IO (stderr,hPutStrLn)
 import Data.Maybe
 import System.IO.Unsafe (unsafePerformIO)
 import System.Log.Logger
+import qualified Data.ByteString.Char8 as B
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 
-data DebugTag = XAnnounce | XDHT | XOnion | XNetCrypto | XPing | XLan | XMisc | XWLog
+-- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
+data DebugTag = XAnnounce | XBitTorrent | XDHT | XLan | XMan | XNetCrypto | XOnion | XPing | XRefresh | XWLog | XMisc
     deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
 appName :: String
@@ -19,6 +23,9 @@ a <.> b = a ++ "." ++ b
 dput :: DebugTag -> String -> IO ()
 dput tag msg = debugM (appName <.> show tag) msg
 
+dputB :: DebugTag -> B.ByteString -> IO ()
+dputB tag msg = debugM (appName <.> show tag) (T.unpack . T.decodeUtf8 $ msg)
+
 setTagLevel :: Priority -> DebugTag -> IO ()
 setTagLevel level tag = updateGlobalLogger (appName <.> show tag) (setLevel level)
 
@@ -27,3 +34,10 @@ setQuiet = setTagLevel WARNING
 
 setVerbose :: DebugTag -> IO ()
 setVerbose = setTagLevel DEBUG
+
+getVerbose tag = do
+    logger <- getLogger (appName <.> show tag)
+    case getLevel logger of
+        Just p | p <= DEBUG -> return True
+        _ -> return False
+