implement DPut using hslogger

2 files changed, 13 insertions, 11 deletions

diff --git a/dht-client.cabal b/dht-client.cabal
index 3a866e45..4d66af24 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -203,6 +203,7 @@ library
                     , hinotify < 0.3.10
                     , reference
                     , avahi >= 0.2.0
+                    , hslogger
 
   if impl(ghc < 8)
       Build-depends:  transformers
diff --git a/src/DPut.hs b/src/DPut.hs
index dc699e76..3cb31160 100644
--- a/src/DPut.hs
+++ b/src/DPut.hs
@@ -5,24 +5,25 @@ import qualified Data.Map.Strict as Map
 import System.IO (stderr,hPutStrLn)
 import Data.Maybe
 import System.IO.Unsafe (unsafePerformIO)
+import System.Log.Logger
 
 data DebugTag = XAnnounce | XDHT | XOnion | XNetCrypto | XPing | XLan | XMisc
     deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
-{-# NOINLINE verbosityMap #-}
-verbosityMap :: TVar (Map.Map DebugTag Bool)
-verbosityMap = unsafePerformIO $ newTVarIO (Map.empty)
+appName :: String
+appName = "toxmpp"
+
+(<.>) :: String -> String -> String
+a <.> b = a ++ "." ++ b
 
 dput :: DebugTag -> String -> IO ()
-dput tag msg
-    = do
-       mp <- atomically $ readTVar verbosityMap
-       if fromMaybe True (Map.lookup tag mp)
-        then System.IO.hPutStrLn stderr msg
-        else return ()
+dput tag msg = debugM (appName <.> show tag) msg
+
+setTagLevel :: Priority -> DebugTag -> IO ()
+setTagLevel level tag = updateGlobalLogger (appName <.> show tag) (setLevel level)
 
 setQuiet :: DebugTag -> IO ()
-setQuiet tag = atomically $ modifyTVar' (verbosityMap) (Map.insert tag False)
+setQuiet = setTagLevel WARNING
 
 setVerbose :: DebugTag -> IO ()
-setVerbose tag = atomically $ modifyTVar' (verbosityMap) (Map.insert tag True)
+setVerbose = setTagLevel DEBUG