From f5811808fa6a1892f5a729c73766aada0ebf5f44 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 13 Dec 2022 18:47:54 +0000 Subject: [PATCH] Adjust some log statement levels Largely so that LOOT's logging can run at info verbosity by default instead of warn without too much detail in the log output. I've also moved some statements between trace and debug based on how useful I think they'd be when debugging issues. --- src/api/game/load_order_handler.cpp | 13 ++++++------- src/api/metadata_list.cpp | 5 +++-- src/api/plugin.cpp | 4 ++-- src/api/sorting/group_sort.cpp | 4 ++-- src/api/sorting/plugin_graph.cpp | 12 ++++++------ src/api/sorting/plugin_sort.cpp | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/api/game/load_order_handler.cpp b/src/api/game/load_order_handler.cpp index 364ee61e..1756125c 100644 --- a/src/api/game/load_order_handler.cpp +++ b/src/api/game/load_order_handler.cpp @@ -88,7 +88,7 @@ LoadOrderHandler::LoadOrderHandler( void LoadOrderHandler::LoadCurrentState() { auto logger = getLogger(); if (logger) { - logger->info("Loading the current load order state."); + logger->trace("Loading the current load order state."); } const unsigned int ret = lo_load_current_state(gh_.get()); @@ -192,16 +192,15 @@ void LoadOrderHandler::SetLoadOrder( const std::vector& loadOrder) const { auto logger = getLogger(); if (logger) { - logger->info("Setting load order."); + logger->debug("Setting load order:"); + for (const auto& plugin : loadOrder) { + logger->debug("\t{}", plugin); + } } std::vector plugins; plugins.reserve(loadOrder.size()); for (const auto& plugin : loadOrder) { - if (logger) { - logger->info("\t\t{}", plugin); - } - plugins.push_back(plugin.c_str()); } @@ -211,7 +210,7 @@ void LoadOrderHandler::SetLoadOrder( HandleError("set the load order", ret); if (logger) { - logger->info("Load order set successfully."); + logger->debug("Load order set successfully."); } } diff --git a/src/api/metadata_list.cpp b/src/api/metadata_list.cpp index 531f7f3f..7e03d203 100644 --- a/src/api/metadata_list.cpp +++ b/src/api/metadata_list.cpp @@ -143,7 +143,7 @@ void MetadataList::Load(const std::filesystem::path& filepath) { auto logger = getLogger(); if (logger) { - logger->debug("Loading file: {}", filepath.u8string()); + logger->trace("Loading file: {}", filepath.u8string()); } std::ifstream in(filepath); @@ -227,7 +227,8 @@ void MetadataList::Load(std::istream& istream, auto logger = getLogger(); if (logger) { - logger->debug("File loaded successfully."); + logger->trace("Successfully loaded metadata from file at \"{}\".", + source_path.u8string()); } } diff --git a/src/api/plugin.cpp b/src/api/plugin.cpp index 02184e2a..2ca3e08b 100644 --- a/src/api/plugin.cpp +++ b/src/api/plugin.cpp @@ -269,8 +269,8 @@ bool Plugin::IsValid(const GameType gameType, auto logger = getLogger(); if (logger) { - logger->info("The file \"{}\" is not a valid plugin.", - pluginPath.filename().u8string()); + logger->debug("The file \"{}\" is not a valid plugin.", + pluginPath.filename().u8string()); } return false; diff --git a/src/api/sorting/group_sort.cpp b/src/api/sorting/group_sort.cpp index 110d5e3a..fbdeb764 100644 --- a/src/api/sorting/group_sort.cpp +++ b/src/api/sorting/group_sort.cpp @@ -187,7 +187,7 @@ GetTransitiveAfterGroups(const std::vector& masterlistGroups, auto logger = getLogger(); if (logger) { - logger->info("Sorting groups according to their load after data"); + logger->trace("Sorting groups according to their load after data"); } // Check for cycles. @@ -214,7 +214,7 @@ GetTransitiveAfterGroups(const std::vector& masterlistGroups, transitiveAfterGroups[graph[vertex]] = visitedGroups; if (logger) { - logger->trace("Group \"{}\" transitively loads after groups \"{}\"", + logger->debug("Group \"{}\" transitively loads after groups \"{}\"", graph[vertex], joinUnorderedSet(visitedGroups)); } diff --git a/src/api/sorting/plugin_graph.cpp b/src/api/sorting/plugin_graph.cpp index 2b18694c..81870474 100644 --- a/src/api/sorting/plugin_graph.cpp +++ b/src/api/sorting/plugin_graph.cpp @@ -440,7 +440,7 @@ void PluginGraph::AddEdge(const vertex_t& fromVertex, auto logger = getLogger(); if (logger) { - logger->trace("Adding {} edge from \"{}\" to \"{}\".", + logger->debug("Adding {} edge from \"{}\" to \"{}\".", describeEdgeType(edgeType), GetPlugin(fromVertex).GetName(), GetPlugin(toVertex).GetName()); @@ -650,7 +650,7 @@ void PluginGraph::AddHardcodedPluginEdges(const Game& game) { loot::equivalent(game.DataPath() / u8path(plugin), game.DataPath() / "update.esm")) { if (logger) { - logger->trace( + logger->debug( "Skipping adding hardcoded plugin edges for Update.esm as it does " "not have a hardcoded position for Skyrim."); continue; @@ -661,7 +661,7 @@ void PluginGraph::AddHardcodedPluginEdges(const Game& game) { if (!pluginVertex.has_value()) { if (logger) { - logger->trace( + logger->debug( "Skipping adding hardcoded plugin edges for \"{}\" as it has not " "been loaded.", plugin); @@ -707,7 +707,7 @@ void PluginGraph::AddGroupEdges( const auto& fromPlugin = GetPlugin(parentVertex.value()); if (logger) { - logger->trace( + logger->debug( "Skipping group edge from \"{}\" to \"{}\" as it would " "create a cycle.", fromPlugin.GetName(), @@ -762,7 +762,7 @@ void PluginGraph::AddGroupEdges( if (!ignore) { AddEdge(edgePair.first, edgePair.second, EdgeType::group); } else if (logger) { - logger->trace( + logger->debug( "Skipping group edge from \"{}\" to \"{}\" as it would " "create a multi-group cycle.", fromPlugin.GetName(), @@ -783,7 +783,7 @@ void PluginGraph::AddOverlapEdges() { if (plugin.NumOverrideFormIDs() == 0) { if (logger) { - logger->trace( + logger->debug( "Skipping vertex for \"{}\": the plugin contains no override " "records.", plugin.GetName()); diff --git a/src/api/sorting/plugin_sort.cpp b/src/api/sorting/plugin_sort.cpp index 8948de48..d4af27e6 100644 --- a/src/api/sorting/plugin_sort.cpp +++ b/src/api/sorting/plugin_sort.cpp @@ -42,9 +42,9 @@ std::vector SortPlugins( auto logger = getLogger(); if (logger) { - logger->info("Current load order: "); + logger->debug("Current load order:"); for (const auto& plugin : loadOrder) { - logger->info("\t\t{}", plugin); + logger->debug("\t{}", plugin); } } @@ -84,9 +84,9 @@ std::vector SortPlugins( const auto newLoadOrder = graph.ToPluginNames(path); if (logger) { - logger->info("Calculated order: "); + logger->debug("Calculated order:"); for (const auto& name : newLoadOrder) { - logger->info("\t{}", name); + logger->debug("\t{}", name); } }