X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=daef13f77aa1fae64eaf8a7fffced1eae016f6b0;hb=d1b888f38fe7b1026befc86692d8fe86d8adc352;hp=06cff04956b8b1a28fde9ff31c493def5a5930f7;hpb=b4ec9ce787c63b27c96c404b1bd44eccd56ab16e;p=dcpomatic.git

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 06cff0495..daef13f77 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,25 +21,42 @@
  *  @brief A very simple logging class.
  */
 
-#include <fstream>
 #include <time.h>
+#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 (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
-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;
 	}
 
@@ -47,51 +64,47 @@ Log::log (string m, Level l)
 	time (&t);
 	string a = ctime (&t);
 
-	stringstream s;
-	s << a.substr (0, a.length() - 1) << ": " << 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;
-	s << tv.tv_sec << ":" << tv.tv_usec << " " << m;
+	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 == "verbose") {
-		set_level (VERBOSE);
-		return;
-	} else if (l == "timing") {
-		set_level (TIMING);
-		return;
-	}
-
-	set_level (STANDARD);
+	_types = t;
 }
 
 /** @param file Filename to write log to */
-FileLog::FileLog (string file)
+FileLog::FileLog (boost::filesystem::path file)
 	: _file (file)
 {
 
@@ -100,7 +113,55 @@ FileLog::FileLog (string file)
 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);
 }
 
+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;
+}