projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak --export-filename help.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_disk_writer.cc
diff --git
a/src/tools/dcpomatic_disk_writer.cc
b/src/tools/dcpomatic_disk_writer.cc
index 7ed64d52c7a308285d201e72dc5149076fe71ea2..67de360d3348bafd18c09c14e6c49ab206535645 100644
(file)
--- a/
src/tools/dcpomatic_disk_writer.cc
+++ b/
src/tools/dcpomatic_disk_writer.cc
@@
-27,7
+27,9
@@
#include "lib/exceptions.h"
#include "lib/ext.h"
#include "lib/file_log.h"
#include "lib/exceptions.h"
#include "lib/ext.h"
#include "lib/file_log.h"
+#include "lib/state.h"
#include "lib/nanomsg.h"
#include "lib/nanomsg.h"
+#include "lib/util.h"
#include "lib/version.h"
#include "lib/warnings.h"
#include "lib/version.h"
#include "lib/warnings.h"
@@
-43,6
+45,7
@@
extern "C" {
#include <lwext4/file_dev.h>
}
extern "C" {
#include <lwext4/file_dev.h>
}
+#include <unistd.h>
#include <xpc/xpc.h>
#endif
#include <xpc/xpc.h>
#endif
@@
-283,12
+286,12
@@
main ()
* redirect this to a file in /var/log
*/
dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
* redirect this to a file in /var/log
*/
dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
- LOG_DISK("dcpomatic_disk_writer %1 started
", dcpomatic_git_commit
);
+ LOG_DISK("dcpomatic_disk_writer %1 started
uid=%2 euid=%3", dcpomatic_git_commit, getuid(), geteuid()
);
#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.
*/
#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.
*/
- dcpomatic_log.reset(new FileLog(
config_path() / "disk_writer.log"
, LogEntry::TYPE_DISK));
+ dcpomatic_log.reset(new FileLog(
State::write_path("disk_writer.log")
, LogEntry::TYPE_DISK));
LOG_DISK_NC("dcpomatic_disk_writer started");
#endif
LOG_DISK_NC("dcpomatic_disk_writer started");
#endif
@@
-306,6
+309,7
@@
main ()
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
+ LOG_DISK_NC("Entering main loop");
auto ml = Glib::MainLoop::create ();
Glib::signal_timeout().connect(sigc::ptr_fun(&idle), 500);
ml->run ();
auto ml = Glib::MainLoop::create ();
Glib::signal_timeout().connect(sigc::ptr_fun(&idle), 500);
ml->run ();