More error message improvements.

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index f6a42c6f064569ab0d7f55ee0b234373355495f8..f02091449d6cb93f04c24343d2a0b5ffb854665b 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -391,7 +391,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 
                boost::filesystem::create_hard_link (video_from, video_to, ec);
                if (ec) {
-                       LOG_WARNING_NC ("Hard-link failed; copying instead");
+                       LOG_WARNING("Hard-link failed (%1); copying instead", error_details(ec));
                        auto job = _job.lock ();
                        if (job) {
                                job->sub (_("Copying video file into DCP"));
@@ -404,7 +404,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
                        } else {
                                boost::filesystem::copy_file (video_from, video_to, ec);
                                if (ec) {
-                                       LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message());
+                                       LOG_ERROR("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), error_details(ec));
                                        throw FileError (ec.message(), video_from);
                                }
                        }
@@ -423,7 +423,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
                boost::filesystem::rename (film()->file(aaf), audio_to, ec);
                if (ec) {
                        throw FileError (
-                               String::compose (_("could not move audio asset into the DCP (%1:%2)"), ec.category().name(), ec.value()), aaf
+                               String::compose(_("could not move audio asset into the DCP (%1)"), error_details(ec)), aaf
                                );
                }
 
@@ -440,7 +440,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
                boost::filesystem::rename (film()->file(aaf), atmos_to, ec);
                if (ec) {
                        throw FileError (
-                               String::compose (_("could not move atmos asset into the DCP (%1:%2)"), ec.category().name(), ec.value()), aaf
+                               String::compose(_("could not move atmos asset into the DCP (%1)"), error_details(ec), aaf
                                );
                }
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2a21477fd5c744ab5cefad7403a743841a5a33fe..dd9bbb7eb0ca648d568caf66e158c7e74774ef6c 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1181,3 +1181,9 @@ capture_asdcp_logs ()
        Kumu::SetDefaultLogSink(&log_sink);
 }
 
+
+string
+error_details(boost::system::error_code ec)
+{
+       return String::compose("%1:%2:%3", ec.category().name(), ec.value(), ec.message());
+}

diff --git a/src/lib/util.h b/src/lib/util.h
index fba5b6828855f9d3a7968bcea3c561e35b34ff26..c62b98df65c140cfcedc90d13cbfca36e45dd181 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -126,6 +126,7 @@ extern boost::filesystem::path default_font_file ();
 extern std::string to_upper (std::string s);
 extern void start_of_thread (std::string name);
 extern void capture_asdcp_logs ();
+extern std::string error_details(boost::system::error_code ec);
 
 template <class T>
 std::list<T>