X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=156f8cf8bb3bc38e2c0964dfd19c243b095f802f;hb=90ec60c9e5b45453525368842345ad1a6498fa61;hp=a0b031589bf1836080c98c170c2fde1860df8dfe;hpb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;p=dcpomatic.git

diff --git a/src/lib/log.cc b/src/lib/log.cc
index a0b031589..156f8cf8b 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -25,24 +25,38 @@
 #include <cstdio>
 #include "log.h"
 #include "cross.h"
+#include "config.h"
+#include "safe_stringstream.h"
 
 #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 ()
-	: _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
-Log::log (string m, Level l)
+Log::log (string message, int type)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (l > _level) {
+	if ((_types & type) == 0) {
 		return;
 	}
 
@@ -50,47 +64,43 @@ Log::log (string m, Level l)
 	time (&t);
 	string a = ctime (&t);
 
-	stringstream s;
-	s << a.substr (0, a.length() - 1) << N_(": ") << m;
+	SafeStringStream s;
+	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
-Log::microsecond_log (string m, Level l)
+Log::microsecond_log (string m, int t)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (l > _level) {
+	if ((_types & t) == 0) {
 		return;
 	}
 
 	struct timeval tv;
 	gettimeofday (&tv, 0);
 
-	stringstream s;
+	SafeStringStream s;
 	s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
 	do_log (s.str ());
 }	
 
 void
-Log::set_level (Level l)
+Log::set_types (int t)
 {
 	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 */
@@ -113,3 +123,42 @@ FileLog::do_log (string m)
 	fclose (f);
 }
 
+string
+FileLog::head_and_tail () const
+{
+	boost::mutex::scoped_lock lm (_mutex);
+
+	uintmax_t head_amount = 1024;
+	uintmax_t tail_amount = 1024;
+	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 += buffer;
+
+	fseek (f, tail_amount, SEEK_END);
+	
+	N = fread (buffer, 1, tail_amount, f);
+	buffer[N] = '\0';
+	out += buffer;
+
+	delete[] buffer;
+
+	fclose (f);
+
+	return out;
+}