=make demux not always global, make filelogger flush

Author: oxinabox

src/LoggingExtras.jl

@@ -1,12 +1,15 @@
 module LoggingExtras
 
 using Base.CoreLogging:
-    LogLevel, BelowMinLevel, Debug, Info, Warn, Error, AboveMaxLevel,
+    global_logger,
+    LogLevel, BelowMinLevel, Debug, Info, Warn, Error, AboveMaxLevel
 
 import Base.CoreLogging:
     AbstractLogger, SimpleLogger,
-	handle_message, shouldlog, min_enabled_level, catch_exceptions,
+	handle_message, shouldlog, min_enabled_level, catch_exceptions
 
+export demux_global_logger,
+    DemuxLogger, FilterLogger, FileLogger
 
 include("demuxlogger.jl")
 include("filteredlogger.jl")

src/demuxlogger.jl

@@ -2,38 +2,41 @@ struct DemuxLogger <: AbstractLogger
 	loggers::Vector{AbstractLogger}
 end
 
+
+
 """
-	demux_global_logger!(loggers...; include_current=true)
+    DemuxLogger(loggers...; include_current=true)
 
 Sets the global_logger to demux,
 so that messages are sent to all the loggers.
-If `include_current` is true, then messages are also sent to the old global logger.
+If `include_current_global` is true, then messages are also sent to the global logger
+(or rather to what was the global logger when this was constructed).
 Normally this would be the ConsoleLogger in the REPL etc.
 """
-function demux_global_logger!(loggers...; include_current=true)
-	loggers = collect(loggers)
-	if include_current
+function DemuxLogger(loggers::Vararg{AbstractLogger}; include_current_global=true)
+    loggers = Vector{AbstractLogger}(collect(loggers))
+	if include_current_global
 		push!(loggers, global_logger())
 	end
-	global_logger(DemuxLogger(loggers))
+	DemuxLogger(loggers)
 end
 
-function handle_message(demux::demux, level, message, _module, group, id, file, line; kwargs...)
+function handle_message(demux::DemuxLogger, level, message, _module, group, id, file, line; kwargs...)
 	for logger in demux.loggers
 		if shouldlog(logger,  level, _module, group, id)
 			handle_message(logger, level, message, _module, group, id, file, line; kwargs...)
 		end
 	end
 end
 
-function shouldlog(demux::demux, level, _module, group, id)
+function shouldlog(demux::DemuxLogger, level, _module, group, id)
 	any(shouldlog(logger, level, _module, group, id) for logger in demux.loggers)
 end
 
-function min_enabled_level(demux::demux)
+function min_enabled_level(demux::DemuxLogger)
 	minimum(min_enabled_level(logger) for logger in demux.loggers)
 end
 
-function catch_exceptions(demux::demux)
+function catch_exceptions(demux::DemuxLogger)
 	any(catch_exceptions(logger) for logger in demux.loggers)
 end

src/filelogger.jl

@@ -1,17 +1,21 @@
+# TODO: Maybe this should just be a function
+# It is a super thing wrapper around a SimpleLogger
+
+
 struct FileLogger <: AbstractLogger
 	logger::SimpleLogger
-	function FileLogger(path, level=Info; append=false)
-		filehandle = open(path, append ? "a" : "w")
-		this = new(SimpleLogger(filehandle, level))
-		finalizer(this) do this
-			close(filehandle)
-		end
-	end
+    always_flush::Bool
+end
+
+function FileLogger(path, level=Info; append=false, always_flush=true)
+    filehandle = open(path, append ? "a" : "w")
+    FileLogger(SimpleLogger(filehandle, level), always_flush)
 end
 
 
 function handle_message(filelogger::FileLogger, level, message, _module, group, id, file, line; kwargs...)
 	handle_message(filelogger.logger, level, message, _module, group, id, file, line; kwargs...)
+    filelogger.always_flush && flush(filelogger.logger.stream)
 end
 shouldlog(filelogger::FileLogger, level, _module, group, id) = shouldlog(filelogger.logger, level, _module, group, id)
 min_enabled_level(filelogger::FileLogger) = min_enabled_level(filelogger.logger)