Handle TOML parsing errors for ActiveTransactionInfo

Errors are no longer silently ignored, a new
ActiveTransactionInfoParseError is thrown instead. The error is caught
and logged during the transaction run.

Author: m-blaha

include/libdnf5/base/active_transaction_info.hpp

@@ -4,6 +4,7 @@
 #ifndef LIBDNF5_BASE_ACTIVE_TRANSACTION_INFO_HPP
 #define LIBDNF5_BASE_ACTIVE_TRANSACTION_INFO_HPP
 
+#include "libdnf5/common/exception.hpp"
 #include "libdnf5/defs.h"
 
 #include <unistd.h>
@@ -14,6 +15,13 @@
 
 namespace libdnf5::base {
 
+class LIBDNF_API ActiveTransactionInfoParseError : public libdnf5::Error {
+public:
+    using libdnf5::Error::Error;
+    const char * get_domain_name() const noexcept override { return "libdnf5::base"; }
+    const char * get_name() const noexcept override { return "ActiveTransactionInfoParseError"; }
+};
+
 class LIBDNF_API ActiveTransactionInfo {
 public:
     ActiveTransactionInfo();
@@ -54,7 +62,8 @@ class LIBDNF_API ActiveTransactionInfo {
 
     /// @brief Create ActiveTransactionInfo from TOML string
     /// @param toml_string The TOML string to parse
-    /// @return ActiveTransactionInfo object parsed from TOML, or empty object if parsing fails
+    /// @return ActiveTransactionInfo object parsed from TOML
+    /// @throws ActiveTransactionInfoParseError if TOML parsing fails
     static ActiveTransactionInfo from_toml(const std::string & toml_string);
 
 private:

libdnf5/base/active_transaction_info.cpp

@@ -3,6 +3,8 @@
 
 #include "libdnf5/base/active_transaction_info.hpp"
 
+#include "libdnf5/utils/bgettext/bgettext-mark-domain.h"
+
 #include <toml.hpp>
 
 #include <ctime>
@@ -87,10 +89,10 @@ ActiveTransactionInfo ActiveTransactionInfo::from_toml(const std::string & toml_
         info.set_comment(toml::find_or<std::string>(data, "comment", ""));
         info.set_pid(toml::find_or<pid_t>(data, "pid", -1));
         info.set_start_time(toml::find_or<time_t>(data, "start_time", 0));
-    } catch (const toml::syntax_error &) {
-        // Return default/empty ActiveTransactionInfo on TOML syntax errors
-    } catch (const toml::type_error &) {
-        // Return default/empty ActiveTransactionInfo on TOML type errors
+    } catch (const toml::syntax_error & ex) {
+        throw ActiveTransactionInfoParseError(M_("Error parsing transaction info: {}"), std::string(ex.what()));
+    } catch (const toml::type_error & ex) {
+        throw ActiveTransactionInfoParseError(M_("Error parsing transaction info: {}"), std::string(ex.what()));
     }
 
     return info;

libdnf5/base/transaction.cpp

@@ -986,10 +986,15 @@ Transaction::TransactionRunResult Transaction::Impl::_run(
     lock_file_path /= std::filesystem::path(libdnf5::TRANSACTION_LOCK_FILEPATH).relative_path();
     std::filesystem::create_directories(lock_file_path.parent_path());
 
+    auto logger = base->get_logger().get();
     TransactionLocker transaction_locker(lock_file_path, info);
     if (!transaction_locker.write_lock()) {
         auto content = transaction_locker.read_content();
-        concurrent_transaction = std::make_unique<ActiveTransactionInfo>(ActiveTransactionInfo::from_toml(content));
+        try {
+            concurrent_transaction = std::make_unique<ActiveTransactionInfo>(ActiveTransactionInfo::from_toml(content));
+        } catch (const ActiveTransactionInfoParseError & ex) {
+            logger->warning(ex.what());
+        }
         return TransactionRunResult::ERROR_LOCK;
     }
     transaction_locker.write_transaction_metadata();
@@ -1105,9 +1110,6 @@ Transaction::TransactionRunResult Transaction::Impl::_run(
     db_transaction.set_dt_start(std::chrono::duration_cast<std::chrono::seconds>(time).count());
     db_transaction.start();
 
-
-    auto logger = base->get_logger().get();
-
     int pipe_out_from_scriptlets[2];
     if (pipe2(pipe_out_from_scriptlets, O_CLOEXEC) == -1) {
         logger->error("Transaction::Run: Cannot create pipe: {}", std::strerror(errno));