Merge with 0.4.1

2 files changed, 137 insertions, 22 deletions

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 973edbf4..bf800020 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -9,41 +9,156 @@ local math_max = math.max;
 local logger = require "util.logger";
 
 -- Global log function, because some people are too 
--- lazy to get their own
+-- lazy to get their own...
 _G.log = logger.init("general");
 
--- Disable log output, needs to read from config
--- logger.setwriter(function () end);
+local log_sink_types = {};
+local get_levels;
 
-local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
-local do_pretty_printing = not os.getenv("WINDIR");
+--- Main function to read config, create the appropriate sinks and tell logger module
+function setup_logging(log)
+	log = log or config.get("*", "core", "log") or default_logging;
+	-- Set default logger
+	if type(log) == "string" then
+		if not log:match("^%*") then
+		end
+	elseif type(log) == "table" then
+		-- Advanced configuration chosen
+		for i, sink_config in ipairs(log) do
+			local sink_maker = log_sink_types[sink_config.to];
+			if sink_maker then
+				if sink_config.levels and not sink_config.source then
+					-- Create sink
+					local sink = sink_maker(sink_config);
+					
+					-- Set sink for all chosen levels
+					for level in pairs(get_levels(sink_config.levels)) do
+						logger.add_level_sink(level, sink);
+					end
+				elseif sink_config.source and not sink_config.levels then
+					logger.add_name_sink(sink_config.source, sink_maker(sink_config));
+				elseif sink_config.source and sink_config.levels then
+					local levels = get_levels(sink_config.levels);
+					local sink = sink_maker(sink_config);
+					logger.add_name_sink(sink_config.source,
+						function (name, level, ...)
+							if levels[level] then
+								return sink(name, level, ...);
+							end
+						end);
+				else
+					-- All sources	
+				end
+			else
+				-- No such sink type
+			end
+		end
+	end
+end
 
-local logstyles = {};
+--- Definition of built-in logging sinks ---
+local math_max, rep = math.max, string.rep;
+
+-- Column width for "source" (used by stdout and console)
 
---TODO: This should be done in config, but we don't have proper config yet
-if do_pretty_printing then
-	logstyles["info"] = getstyle("bold");
-	logstyles["warn"] = getstyle("bold", "yellow");
-	logstyles["error"] = getstyle("bold", "red");
+function log_sink_types.nowhere()
+	return function () return false; end;
 end
 
 local sourcewidth = 20;
-local math_max, rep = math.max, string.rep;
-local function make_default_log_sink(level)
-	return function (name, _level, message, ...)
+
+function log_sink_types.stdout()
+	return function (name, level, message, ...)
 		sourcewidth = math_max(#name+2, sourcewidth);
 		local namelen = #name;
 		if ... then 
-			io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
+			io_write(name, rep(" ", sourcewidth-namelen), level, "\t", format(message, ...), "\n");
 		else
-			io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n");
+			io_write(name, rep(" ", sourcewidth-namelen), level, "\t", message, "\n");
 		end
+	end	
+end
+
+do
+	local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
+	local do_pretty_printing = not os.getenv("WINDIR");
+	
+	local logstyles = {};
+	if do_pretty_printing then
+		logstyles["info"] = getstyle("bold");
+		logstyles["warn"] = getstyle("bold", "yellow");
+		logstyles["error"] = getstyle("bold", "red");
+	end
+	function log_sink_types.console(config)
+		-- Really if we don't want pretty colours then just use plain stdout
+		if not do_pretty_printing then
+			return log_sink_types.stdout(config);
+		end
+		
+		return function (name, level, message, ...)
+			sourcewidth = math_max(#name+2, sourcewidth);
+			local namelen = #name;
+			if ... then 
+				io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
+			else
+				io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n");
+			end
+		end
+	end
+end
+
+function log_sink_types.file(config)
+	local log = config.filename;
+	local logfile = io.open(log, "a+");
+	if not logfile then
+		return function () end
+	end
+
+	local write, format, flush = logfile.write, string.format, logfile.flush;
+	return function (name, level, message, ...)
+		if ... then 
+			write(logfile, name, "\t", level, "\t", format(message, ...), "\n");
+		else
+			write(logfile, name, "\t" , level, "\t", message, "\n");
+		end
+		flush(logfile);
+	end;
+end
+
+function log_sink_types.syslog()
+end
+
+--- Helper function to get a set of levels given a "criteria" table
+local logging_levels = { "debug", "info", "warn", "error", "critical" }
+
+function get_levels(criteria, set)
+	set = set or {};
+	if type(criteria) == "string" then
+		set[criteria] = true;
+		return set;
+	end
+	local min, max = criteria.min, criteria.max;
+	if min or max then
+		local in_range;
+		for _, level in ipairs(logging_levels) do
+			if min == level then
+				set[level] = true;
+				in_range = true;
+			elseif max == level then
+				set[level] = true;
+				return set;
+			elseif in_range then
+				set[level] = true;
+			end	
+		end
+	end
+	
+	for _, level in ipairs(criteria) do
+		set[level] = true;
 	end
+	return set;
 end
 
--- Set default sinks
-logger.add_level_sink("debug", make_default_log_sink("debug"));
-logger.add_level_sink("info", make_default_log_sink("info"));
-logger.add_level_sink("warn", make_default_log_sink("warn"));
-logger.add_level_sink("error", make_default_log_sink("error"));
+--- Set up logging
+setup_logging();
 
diff --git a/util/logger.lua b/util/logger.lua
index 1a2985b4..4ad42433 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -75,7 +75,7 @@ function make_logger(source_name, level)
 	local logger = function (message, ...)
 		if source_handlers then
 			for i = 1,num_source_handlers do
-				if source_handlers(source_name, level, message, ...) == false then
+				if source_handlers[i](source_name, level, message, ...) == false then
 					return;
 				end
 			end