projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variable.
[dcpomatic.git]
/
src
/
lib
/
log.cc
diff --git
a/src/lib/log.cc
b/src/lib/log.cc
index 7f1eea20634f8cba480d8d6884765f7e1be14268..4de6bd874e94c4c97feed165a210de7b10169936 100644
(file)
--- a/
src/lib/log.cc
+++ b/
src/lib/log.cc
@@
-21,47
+21,89
@@
* @brief A very simple logging class.
*/
* @brief A very simple logging class.
*/
-#include <fstream>
#include <time.h>
#include <time.h>
+#include <cstdio>
#include "log.h"
#include "log.h"
+#include "cross.h"
+#include "config.h"
+
+#include "i18n.h"
using namespace std;
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 (VERBOSE
)
+ : _
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;
}
-
+
time_t t;
time (&t);
string a = ctime (&t);
stringstream s;
time_t t;
time (&t);
string a = ctime (&t);
stringstream s;
- s << a.substr (0, a.length() - 1) << ": " << 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::
set_level (Level l
)
+Log::
microsecond_log (string m, int t
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- _level = l;
-}
+ if ((_types & t) == 0) {
+ return;
+ }
+
+ struct timeval tv;
+ gettimeofday (&tv, 0);
+
+ stringstream s;
+ s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
+ do_log (s.str ());
+}
+
+void
+Log::set_types (int t)
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _types = t;
+}
/** @param file Filename to write log to */
/** @param file Filename to write log to */
-FileLog::FileLog (
string
file)
+FileLog::FileLog (
boost::filesystem::path
file)
: _file (file)
{
: _file (file)
{
@@
-70,7
+112,13
@@
FileLog::FileLog (string file)
void
FileLog::do_log (string m)
{
void
FileLog::do_log (string m)
{
- ofstream f (_file.c_str(), fstream::app);
- f << m << "\n";
+ 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);
}
}