Add log TYPE_DEBUG from 1.x.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index be32315d108a5bad7c84d49dd8c5a858f452fa39..e0ba3aaaaba87f9458c8cc365e12986dfde176ee 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,28 +21,27 @@
  *  @brief A very simple logging class.
  */
 
-#include <time.h>
-#include <cstdio>
-#include <boost/algorithm/string.hpp>
 #include "log.h"
 #include "cross.h"
 #include "config.h"
+#include "safe_stringstream.h"
+#include <time.h>
+#include <cstdio>
 
 #include "i18n.h"
 
 using namespace std;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
 
-int const Log::GENERAL = 0x1;
-int const Log::WARNING = 0x2;
-int const Log::ERROR   = 0x4;
-int const Log::TIMING  = 0x8;
+int const Log::TYPE_GENERAL = 0x1;
+int const Log::TYPE_WARNING = 0x2;
+int const Log::TYPE_ERROR   = 0x4;
+int const Log::TYPE_DEBUG   = 0x8;
+int const Log::TYPE_TIMING  = 0x10;
 
 Log::Log ()
        : _types (0)
 {
-       Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
        config_changed ();
 }
 
@@ -66,14 +65,14 @@ Log::log (string message, int type)
        time (&t);
        string a = ctime (&t);
 
-       stringstream s;
+       SafeStringStream s;
        s << a.substr (0, a.length() - 1) << N_(": ");
 
-       if (type & ERROR) {
+       if (type & TYPE_ERROR) {
                s << "ERROR: ";
        }
 
-       if (type & WARNING) {
+       if (type & TYPE_WARNING) {
                s << "WARNING: ";
        }
        
@@ -93,7 +92,7 @@ Log::microsecond_log (string m, int t)
        struct timeval tv;
        gettimeofday (&tv, 0);
 
-       stringstream s;
+       SafeStringStream s;
        s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
        do_log (s.str ());
 }      
@@ -105,30 +104,6 @@ Log::set_types (int t)
        _types = t;
 }
 
-/** @param A comma-separate list of debug types to enable */
-void
-Log::set_types (string t)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-
-       vector<string> types;
-       split (types, t, is_any_of (","));
-
-       _types = 0;
-
-       for (vector<string>::const_iterator i = types.begin(); i != types.end(); ++i) {
-               if (*i == N_("general")) {
-                       _types |= GENERAL;
-               } else if (*i == N_("warning")) {
-                       _types |= WARNING;
-               } else if (*i == N_("error")) {
-                       _types |= ERROR;
-               } else if (*i == N_("timing")) {
-                       _types |= TIMING;
-               }
-       }
-}
-
 /** @param file Filename to write log to */
 FileLog::FileLog (boost::filesystem::path file)
        : _file (file)
@@ -149,3 +124,45 @@ FileLog::do_log (string m)
        fclose (f);
 }
 
+string
+FileLog::head_and_tail (int amount) const
+{
+       boost::mutex::scoped_lock lm (_mutex);
+
+       uintmax_t head_amount = amount;
+       uintmax_t tail_amount = amount;
+       uintmax_t size = boost::filesystem::file_size (_file);
+
+       if (size < (head_amount + tail_amount)) {
+               head_amount = size;
+               tail_amount = 0;
+       }
+       
+       FILE* f = fopen_boost (_file, "r");
+       if (!f) {
+               return "";
+       }
+
+       string out;
+
+       char* buffer = new char[max(head_amount, tail_amount) + 1];
+       
+       int N = fread (buffer, 1, head_amount, f);
+       buffer[N] = '\0';
+       out += string (buffer);
+
+       if (tail_amount > 0) {
+               out +=  "\n .\n .\n .\n";
+
+               fseek (f, - tail_amount - 1, SEEK_END);
+               
+               N = fread (buffer, 1, tail_amount, f);
+               buffer[N] = '\0';
+               out += string (buffer) + "\n";
+       }
+
+       delete[] buffer;
+       fclose (f);
+
+       return out;
+}