tracing for gcv2 (#574)

- Improvement: Added more trace scopes for GCv2
- Bugfix: Make sure we can override flags to "false" when running `zen gc` commmand
  - `smallobjects`, `skipcid`, `skipdelete`, `verbose`

1 files changed, 4 insertions, 16 deletions

diff --git a/src/zen/cmds/admin_cmd.cpp b/src/zen/cmds/admin_cmd.cpp
index 86a180d54..50510ce03 100644
--- a/src/zen/cmds/admin_cmd.cpp
+++ b/src/zen/cmds/admin_cmd.cpp
@@ -132,10 +132,7 @@ GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	}
 
 	cpr::Parameters Params;
-	if (m_SmallObjects)
-	{
-		Params.Add({"smallobjects", "true"});
-	}
+	Params.Add({"smallobjects", m_SmallObjects ? "true" : "false"});
 	if (m_MaxCacheDuration != 0)
 	{
 		Params.Add({"maxcacheduration", fmt::format("{}", m_MaxCacheDuration)});
@@ -144,14 +141,8 @@ GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	{
 		Params.Add({"disksizesoftlimit", fmt::format("{}", m_DiskSizeSoftLimit)});
 	}
-	if (m_SkipCid)
-	{
-		Params.Add({"skipcid", "true"});
-	}
-	if (m_SkipDelete)
-	{
-		Params.Add({"skipdelete", "true"});
-	}
+	Params.Add({"skipcid", m_SkipCid ? "true" : "false"});
+	Params.Add({"skipdelete", m_SkipDelete ? "true" : "false"});
 	if (m_ForceUseGCV1)
 	{
 		if (m_ForceUseGCV2)
@@ -168,10 +159,7 @@ GcCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 	{
 		Params.Add({"compactblockthreshold", fmt::format("{}", m_CompactBlockThreshold)});
 	}
-	if (m_Verbose)
-	{
-		Params.Add({"verbose", "true"});
-	}
+	Params.Add({"verbose", m_Verbose ? "true" : "false"});
 
 	cpr::Session Session;
 	Session.SetHeader(cpr::Header{{"Accept", "application/json"}});