Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / log.cc

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 7459700eacd43b783da9b61673866f8535c929b4..0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,86 +21,76 @@
  *  @brief A very simple logging class.
  */
 
-#include <fstream>
-#include <time.h>
 #include "log.h"
+#include "cross.h"
+#include "config.h"
+#include "safe_stringstream.h"
+#include "string_log_entry.h"
+#include <time.h>
+#include <cstdio>
+
+#include "i18n.h"
 
-using namespace std;
+using std::string;
+using boost::shared_ptr;
 
 Log::Log ()
-       : _level (STANDARD)
+       : _types (0)
 {
-
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+       config_changed ();
 }
 
-/** @param n String to log */
 void
-Log::log (string m, Level l)
+Log::config_changed ()
 {
-       boost::mutex::scoped_lock lm (_mutex);
-
-       if (l > _level) {
-               return;
-       }
-
-       time_t t;
-       time (&t);
-       string a = ctime (&t);
-
-       stringstream s;
-       s << a.substr (0, a.length() - 1) << ": " << m;
-       do_log (s.str ());
+       set_types (Config::instance()->log_types ());
 }
 
 void
-Log::microsecond_log (string m, Level l)
+Log::log (shared_ptr<const LogEntry> e)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (l > _level) {
+       if ((_types & e->type()) == 0) {
                return;
        }
 
-       struct timeval tv;
-       gettimeofday (&tv, 0);
-
-       stringstream s;
-       s << tv.tv_sec << ":" << tv.tv_usec << " " << m;
-       do_log (s.str ());
-}      
+       do_log (e);
+}
 
+/** @param n String to log */
 void
-Log::set_level (Level l)
+Log::log (string message, int type)
 {
        boost::mutex::scoped_lock lm (_mutex);
-       _level = l;
-}
 
-void
-Log::set_level (string l)
-{
-       if (l == "verbose") {
-               set_level (VERBOSE);
-               return;
-       } else if (l == "timing") {
-               set_level (TIMING);
+       if ((_types & type) == 0) {
                return;
        }
 
-       set_level (STANDARD);
+       do_log (shared_ptr<const LogEntry> (new StringLogEntry (type, message)));
 }
 
-/** @param file Filename to write log to */
-FileLog::FileLog (string file)
-       : _file (file)
+void
+Log::dcp_log (dcp::NoteType type, string m)
 {
-
+       switch (type) {
+       case dcp::DCP_PROGRESS:
+               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m)));
+               break;
+       case dcp::DCP_ERROR:
+               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
+               break;
+       case dcp::DCP_NOTE:
+               do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
+               break;
+       }
 }
 
 void
-FileLog::do_log (string m)
+Log::set_types (int t)
 {
-       ofstream f (_file.c_str(), fstream::app);
-       f << m << "\n";
+       boost::mutex::scoped_lock lm (_mutex);
+       _types = t;
 }
-