X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7;hp=d9696f3cce2ca31bacc89692cbedf7bd468b8880;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=a1201ace8a1d5d3e0a9eca769cb9e0a12bf32693

diff --git a/src/lib/log.cc b/src/lib/log.cc
index d9696f3cc..0f7a59ff8 100644
--- 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
@@ -25,18 +25,14 @@
 #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;
-
-int const Log::TYPE_GENERAL      = 0x1;
-int const Log::TYPE_WARNING      = 0x2;
-int const Log::TYPE_ERROR        = 0x4;
-int const Log::TYPE_DEBUG_DECODE = 0x8;
-int const Log::TYPE_TIMING       = 0x10;
+using std::string;
+using boost::shared_ptr;
 
 Log::Log ()
 	: _types (0)
@@ -51,50 +47,29 @@ Log::config_changed ()
 	set_types (Config::instance()->log_types ());
 }
 
-/** @param n String to log */
 void
-Log::log (string message, int type)
+Log::log (shared_ptr<const LogEntry> e)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if ((_types & type) == 0) {
+	if ((_types & e->type()) == 0) {
 		return;
 	}
 
-	time_t t;
-	time (&t);
-	string a = ctime (&t);
-
-	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 ());
+	do_log (e);
 }
 
+/** @param n String to log */
 void
-Log::microsecond_log (string m, int t)
+Log::log (string message, int type)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if ((_types & t) == 0) {
+	if ((_types & type) == 0) {
 		return;
 	}
 
-	struct timeval tv;
-	gettimeofday (&tv, 0);
-
-	SafeStringStream s;
-	s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
-	do_log (s.str ());
+	do_log (shared_ptr<const LogEntry> (new StringLogEntry (type, message)));
 }
 
 void
@@ -102,13 +77,13 @@ Log::dcp_log (dcp::NoteType type, string m)
 {
 	switch (type) {
 	case dcp::DCP_PROGRESS:
-		log (m, TYPE_GENERAL);
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m)));
 		break;
 	case dcp::DCP_ERROR:
-		log (m, TYPE_ERROR);
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
 		break;
 	case dcp::DCP_NOTE:
-		log (m, TYPE_WARNING);
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
 		break;
 	}
 }
@@ -119,66 +94,3 @@ Log::set_types (int t)
 	boost::mutex::scoped_lock lm (_mutex);
 	_types = t;
 }
-
-/** @param file Filename to write log to */
-FileLog::FileLog (boost::filesystem::path file)
-	: _file (file)
-{
-
-}
-
-void
-FileLog::do_log (string m)
-{
-	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;
-}