From 596d2d3dbb7ec96d88c783efc0f372223f668e50 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Sun, 26 Mar 2023 16:47:51 +0300 Subject: [PATCH] RunExport: reduced noise in terminal --- hbs2-git/lib/HBS2Git/App.hs | 14 ++++++++++---- hbs2-git/lib/HBS2Git/Export.hs | 5 ----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hbs2-git/lib/HBS2Git/App.hs b/hbs2-git/lib/HBS2Git/App.hs index a72f7c2f..51e36fce 100644 --- a/hbs2-git/lib/HBS2Git/App.hs +++ b/hbs2-git/lib/HBS2Git/App.hs @@ -47,12 +47,11 @@ import Codec.Serialise import Data.HashMap.Strict qualified as HashMap import Data.List qualified as List import Data.Text qualified as Text -import System.IO ( stderr ) import Data.IORef import System.IO.Unsafe (unsafePerformIO) -import Data.Cache (Cache) import Data.Cache qualified as Cache import Control.Concurrent.Async +import System.Environment instance MonadIO m => HasCfgKey ConfBranch (Set String) m where key = "branch" @@ -173,12 +172,19 @@ runApp l m = do case l of NoLog -> pure () WithLog -> do - setLogging @DEBUG debugPrefix setLogging @ERROR errorPrefix setLogging @NOTICE noticePrefix - setLogging @TRACE tracePrefix setLogging @INFO infoPrefix + doTrace <- liftIO $ lookupEnv "HBS2TRACE" <&> isJust + + if doTrace then do + setLogging @DEBUG debugPrefix + setLogging @TRACE tracePrefix + else do + setLoggingOff @DEBUG + setLoggingOff @TRACE + (pwd, syn) <- Config.configInit xdgstate <- getAppStateDir diff --git a/hbs2-git/lib/HBS2Git/Export.hs b/hbs2-git/lib/HBS2Git/Export.hs index 7521099d..5f68b254 100644 --- a/hbs2-git/lib/HBS2Git/Export.hs +++ b/hbs2-git/lib/HBS2Git/Export.hs @@ -7,13 +7,8 @@ import HBS2.Data.Types.Refs import HBS2.OrDie import HBS2.System.Logger.Simple import HBS2.Merkle -import HBS2.Hash import HBS2.Net.Proto.Definition() -import HBS2.Net.Auth.Credentials hiding (getCredentials) import HBS2.Base58 --- FIXME: UDP-name-is-irrelevant -import HBS2.Net.Messaging.UDP (UDP) - import HBS2.Git.Local import HBS2.Git.Local.CLI