projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion about subtitle codec pointers.
[dcpomatic.git]
/
src
/
lib
/
log.cc
diff --git
a/src/lib/log.cc
b/src/lib/log.cc
index 9ddf460d43ccc1c382270e607a7634a66be09049..4de6bd874e94c4c97feed165a210de7b10169936 100644
(file)
--- a/
src/lib/log.cc
+++ b/
src/lib/log.cc
@@
-25,24
+25,37
@@
#include <cstdio>
#include "log.h"
#include "cross.h"
#include <cstdio>
#include "log.h"
#include "cross.h"
+#include "config.h"
#include "i18n.h"
using namespace std;
#include "i18n.h"
using namespace std;
+int const Log::TYPE_GENERAL = 0x1;
+int const Log::TYPE_WARNING = 0x2;
+int const Log::TYPE_ERROR = 0x4;
+int const Log::TYPE_TIMING = 0x8;
+
Log::Log ()
Log::Log ()
- : _
level (STANDARD
)
+ : _
types (0
)
{
{
+ _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+ config_changed ();
+}
+void
+Log::config_changed ()
+{
+ set_types (Config::instance()->log_types ());
}
/** @param n String to log */
void
}
/** @param n String to log */
void
-Log::log (string m
, Level l
)
+Log::log (string m
essage, int type
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- if (
l > _level
) {
+ if (
(_types & type) == 0
) {
return;
}
return;
}
@@
-51,16
+64,26
@@
Log::log (string m, Level l)
string a = ctime (&t);
stringstream s;
string a = ctime (&t);
stringstream s;
- s << a.substr (0, a.length() - 1) << N_(": ") << m;
+ s << a.substr (0, a.length() - 1) << N_(": ");
+
+ if (type & TYPE_ERROR) {
+ s << "ERROR: ";
+ }
+
+ if (type & TYPE_WARNING) {
+ s << "WARNING: ";
+ }
+
+ s << message;
do_log (s.str ());
}
void
do_log (s.str ());
}
void
-Log::microsecond_log (string m,
Level l
)
+Log::microsecond_log (string m,
int t
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- if (
l > _level
) {
+ if (
(_types & t) == 0
) {
return;
}
return;
}
@@
-73,24
+96,10
@@
Log::microsecond_log (string m, Level l)
}
void
}
void
-Log::set_
level (Level l
)
+Log::set_
types (int t
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- _level = l;
-}
-
-void
-Log::set_level (string l)
-{
- if (l == N_("verbose")) {
- set_level (VERBOSE);
- return;
- } else if (l == N_("timing")) {
- set_level (TIMING);
- return;
- }
-
- set_level (STANDARD);
+ _types = t;
}
/** @param file Filename to write log to */
}
/** @param file Filename to write log to */
@@
-104,6
+113,11
@@
void
FileLog::do_log (string m)
{
FILE* f = fopen_boost (_file, "a");
FileLog::do_log (string m)
{
FILE* f = fopen_boost (_file, "a");
+ if (!f) {
+ cout << "(could not log to " << _file.string() << "): " << m << "\n";
+ return;
+ }
+
fprintf (f, "%s\n", m.c_str ());
fclose (f);
}
fprintf (f, "%s\n", m.c_str ());
fclose (f);
}