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, 11 insertions, 11 deletions

diff --git a/src/Network/Kademlia/Bootstrap.hs b/src/Network/Kademlia/Bootstrap.hs
index d77f524c..4197e06e 100644
--- a/src/Network/Kademlia/Bootstrap.hs
+++ b/src/Network/Kademlia/Bootstrap.hs
@@ -143,7 +143,7 @@ forkPollForRefresh r@BucketRefresher{ refreshInterval
  where
     refresh :: Int -> IO Int
     refresh n = do
-        -- hPutStrLn stderr $ "Refresh time! "++ show n
+        -- dput XRefresh $ "Refresh time! "++ show n
         refreshBucket r n
 
     go again ( bktnum :-> refresh_time ) = do
@@ -162,7 +162,7 @@ forkPollForRefresh r@BucketRefresher{ refreshInterval
                                        return ()
                              return ()
             picoseconds -> do
-                -- hPutStrLn stderr $ show (picoseconds `div` 10^12) ++ " seconds until refresh " ++ show bktnum
+                -- dput XRefresh $ show (picoseconds `div` 10^12) ++ " seconds until refresh " ++ show bktnum
                 threadDelay ( picoseconds `div` 10^6 )
         again
 
@@ -202,13 +202,13 @@ onFinishedRefresh BucketRefresher { bootstrapCountdown
                                   , refreshQueue
                                   , refreshBuckets     } num now = do
     bootstrapping <- readTVar bootstrapMode
-    if not bootstrapping then return $ return () -- hPutStrLn stderr $ "Finished non-boostrapping refresh: "++show num
+    if not bootstrapping then return $ return () -- dput XRefresh $ "Finished non-boostrapping refresh: "++show num
                          else do
     tbl <- readTVar refreshBuckets
     action <-
       if num /= R.bktCount tbl - 1
         then do modifyTVar' bootstrapCountdown (fmap pred)
-                return $ return () -- hPutStrLn stderr $ "BOOTSTRAP decrement"
+                return $ return () -- dput XRefresh $ "BOOTSTRAP decrement"
         else do
             -- The last bucket finished.
             cnt <- readTVar bootstrapCountdown
@@ -225,17 +225,17 @@ onFinishedRefresh BucketRefresher { bootstrapCountdown
                         -- Schedule immediate refresh for unfull buckets (other than this one).
                         modifyTVar' refreshQueue $ Int.insert n (now - 1)
                     writeTVar bootstrapCountdown $! Just $! length unfull
-                    return $ return () -- hPutStrLn stderr $ "BOOTSTRAP scheduling: "++show unfull
+                    return $ return () -- dput XRefresh $ "BOOTSTRAP scheduling: "++show unfull
                 Just n  -> do writeTVar bootstrapCountdown $! Just $! pred n
-                              return $ return () -- hPutStrLn stderr "BOOTSTRAP decrement (last bucket)"
+                              return $ return () -- dput XRefresh "BOOTSTRAP decrement (last bucket)"
     cnt <- readTVar bootstrapCountdown
     if (cnt == Just 0)
     then do
         -- Boostrap finished!
         writeTVar bootstrapMode False
         writeTVar bootstrapCountdown Nothing
-        return $ do action ; hPutStrLn stderr $ "BOOTSTRAP complete (" ++ show (R.shape tbl) ++ ")."
-    else return $ do action ; hPutStrLn stderr $ "BOOTSTRAP progress " ++ show (num,R.shape tbl,cnt)
+        return $ do action ; dput XRefresh $ "BOOTSTRAP complete (" ++ show (R.shape tbl) ++ ")."
+    else return $ do action ; dput XRefresh $ "BOOTSTRAP progress " ++ show (num,R.shape tbl,cnt)
 
 refreshBucket :: (Show nid, Ord ni, Ord nid, Hashable nid, Hashable ni) =>
                  BucketRefresher nid ni -> Int -> IO Int
@@ -254,7 +254,7 @@ refreshBucket r@BucketRefresher{ refreshSearch  = sch
     fin <- atomically $ newTVar False
     resultCounter <- atomically $ newTVar Set.empty
 
-    hPutStrLn stderr $ "Start refresh " ++ show (n,sample)
+    dput XRefresh $ "Start refresh " ++ show (n,sample)
 
     -- Set 15 minute timeout in order to avoid overlapping refreshes.
     s <- search sch tbl sample $ if n+1 == R.defaultBucketCount
@@ -289,9 +289,9 @@ restartBootstrap r@BucketRefresher{ bootstrapMode, bootstrapCountdown } = do
     writeTVar bootstrapMode True
     writeTVar bootstrapCountdown Nothing
     if not unchanged then return $ do
-                            hPutStrLn stderr "BOOTSTRAP entered bootstrap mode"
+                            dput XRefresh "BOOTSTRAP entered bootstrap mode"
                             refreshLastBucket r
-                     else return $ hPutStrLn stderr "BOOTSTRAP already bootstrapping"
+                     else return $ dput XRefresh "BOOTSTRAP already bootstrapping"
 
 bootstrap :: (Ord ni, Ord nid, Hashable nid, Hashable ni, Foldable t, Foldable t1, Show nid) =>
              BucketRefresher nid ni