2 files changed, 80 insertions, 6 deletions

diff --git a/dht-client.cabal b/dht-client.cabal
index 73c746f9..54b644d3 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -69,7 +69,8 @@ library
                      , RecordWildCards
                      , NondecreasingIndentation
   hs-source-dirs:      src, ., Presence
-  exposed-modules:  DebugTag
+  exposed-modules:  DPut
+                    DebugTag
                     Network.SocketLike
                     Data.Digest.CRC32C
                     Data.Bits.ByteString
@@ -169,7 +170,6 @@ library
                     Network.Tox.Session
 
   build-depends:      base
-                    , dput-hslogger
                     , containers
                     , dependent-sum
                     , array
@@ -277,21 +277,21 @@ executable avahi
   hs-source-dirs:      examples
   main-is:             avahi.hs
   default-language:    Haskell2010
-  build-depends:       base-prelude, dht-client, avahi, network, dput-hslogger
+  build-depends:       base-prelude, dht-client, avahi, network
   ghc-options:         -fobject-code
 
 executable dht
   hs-source-dirs:      examples
   main-is:             dht.hs
   default-language:    Haskell2010
-  build-depends:       base, haskeline, network, bytestring, transformers, dput-hslogger
+  build-depends:       base, haskeline, network, bytestring, transformers
   ghc-options:         -fobject-code
 
 executable dhtd
   hs-source-dirs:      examples
   main-is:             dhtd.hs
   default-language:    Haskell2010
-  build-depends:       base, network, bytestring, hashable, deepseq, dput-hslogger
+  build-depends:       base, network, bytestring, hashable, deepseq
                      , aeson
                      , array
                      , pretty
@@ -334,7 +334,6 @@ executable testTox
   main-is:             testTox.hs
   default-language:    Haskell2010
   build-depends:       base
-                     , dput-hslogger
                      , dht-client
                      , stm
                      , stm-chans
diff --git a/src/DPut.hs b/src/DPut.hs
new file mode 100644
index 00000000..38e532d0
--- /dev/null
+++ b/src/DPut.hs
@@ -0,0 +1,75 @@
+{-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+module DPut where
+
+import Control.Monad.IO.Class
+import qualified Data.Map.Strict as Map
+import Data.Maybe
+import Data.IORef
+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
+import Debug.Trace
+import Data.Typeable
+import Data.Dynamic
+
+type IsDebugTag t = (Eq t, Ord t, Show t, Read t, Enum t, Bounded t,Typeable t)
+
+appName :: String
+appName = "toxmpp"
+
+(<.>) :: String -> String -> String
+a <.> b = a ++ "." ++ b
+
+dput :: (MonadIO m, IsDebugTag tag) => tag -> String -> m ()
+dput tag msg = liftIO $ debugM (appName <.> show tag) msg
+
+dputB :: (MonadIO m, IsDebugTag tag) => tag -> B.ByteString -> m ()
+dputB tag msg = liftIO $ debugM (appName <.> show tag) (T.unpack . T.decodeUtf8 $ msg)
+
+{-# NOINLINE verbosityMap #-}
+verbosityMap :: IORef (Map.Map TypeRep Dynamic)
+verbosityMap = unsafePerformIO $ newIORef (Map.empty)
+
+-- | Trace version of 'dput' works in arbitrary monad, using unsafePerformIO.
+tput :: (Applicative m, IsDebugTag tag) => tag -> String -> m ()
+tput tag msg =
+  let mp = unsafePerformIO $ readIORef verbosityMap
+    in if maybe True (fromMaybe True . Map.lookup tag . flip fromDyn Map.empty) (Map.lookup (typeOf tag) mp)
+        then trace msg (pure ())
+        else pure ()
+
+-- | like 'trace' but parameterized with 'DebugTag'
+dtrace :: forall a tag. IsDebugTag tag =>  tag -> String -> a -> a
+dtrace tag msg result = let mp = unsafePerformIO $ readIORef verbosityMap
+                            mp' :: Map.Map tag Bool
+                            mp' = maybe Map.empty (flip fromDyn Map.empty) (Map.lookup (typeOf tag) mp)
+                            in if fromMaybe True (Map.lookup tag mp')
+                                then trace msg result
+                                else result
+
+setTagLevel :: forall tag. IsDebugTag tag => Priority -> tag -> IO ()
+setTagLevel level tag = do
+    updateGlobalLogger (appName <.> show tag) (setLevel level)
+    modifyIORef verbosityMap $ \mpByType -> do
+        case Map.lookup (typeOf tag) mpByType of
+            Nothing -> Map.insert (typeOf tag) (toDyn $ Map.fromList [(tag,(level <= DEBUG))]) mpByType
+            Just dyn -> let mpByTag :: Map.Map tag Bool
+                            mpByTag = fromDyn dyn Map.empty 
+                            in Map.insert (typeOf tag) (toDyn $ Map.insert tag (level <= DEBUG) mpByTag) mpByType
+
+setQuiet :: forall tag. IsDebugTag tag => tag -> IO ()
+setQuiet = setTagLevel WARNING
+
+setVerbose :: forall tag. IsDebugTag tag => tag -> IO ()
+setVerbose = setTagLevel DEBUG
+
+getVerbose :: forall tag. IsDebugTag tag => tag -> IO Bool
+getVerbose tag = do
+    logger <- getLogger (appName <.> show tag)
+    case getLevel logger of
+        Just p | p <= DEBUG -> return True
+        _ -> return False
+