summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-04-30 20:07:46 +0200
committerCarl Hetherington <cth@carlh.net>2020-04-30 20:07:46 +0200
commit3ee6f2e6ee3682fd1eebfd15c2d61588587e7096 (patch)
treeb41f8de2effc88134a11adff93935c2b788d56b7
parent4c435d735b010929dfb222e2da0cf90205e6a6c1 (diff)
Add git commits to writer log files.v2.15.68
-rw-r--r--src/tools/dcpomatic_disk.cc3
-rw-r--r--src/tools/dcpomatic_disk_writer.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 3532560b7..6f72bfed0 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -34,6 +34,7 @@
#include "lib/copy_to_drive_job.h"
#include "lib/job_manager.h"
#include "lib/disk_writer_messages.h"
+#include "lib/version.h"
#include <wx/wx.h>
#include <boost/process.hpp>
#ifdef DCPOMATIC_WINDOWS
@@ -112,7 +113,7 @@ public:
*/
dcpomatic_log.reset(new FileLog(config_path() / "disk.log"));
dcpomatic_log->set_types (dcpomatic_log->types() | LogEntry::TYPE_DISK);
- LOG_DISK_NC("dcpomatic_disk started");
+ LOG_DISK("dcpomatic_disk %1 started", dcpomatic_git_commit);
drive_refresh ();
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index d22bff412..66f347943 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -18,6 +18,7 @@
*/
+#include "lib/version.h"
#include "lib/disk_writer_messages.h"
#include "lib/compose.hpp"
#include "lib/exceptions.h"
@@ -510,7 +511,7 @@ main ()
* redirect this to a file in /var/log
*/
dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
- LOG_DISK_NC("dcpomatic_disk_writer started");
+ LOG_DISK("dcpomatic_disk_writer %1 started", dcpomatic_git_commit);
#else
/* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's
* a better place to put them.