Mercurial Hosting > luan

changeset 532:9bf9ad733827

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add logging/init so that logging can be used if initialized elsewhere
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 27 May 2015 22:19:46 -0600
parents f99c79b0b426
children 8e51d6071b67
files http/src/luan/modules/http/Server.luan logging/src/luan/modules/logging/Logging.luan logging/src/luan/modules/logging/init.luan
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
diff -r f99c79b0b426 -r 9bf9ad733827 http/src/luan/modules/http/Server.luan
--- a/http/src/luan/modules/http/Server.luan	Wed May 27 22:01:40 2015 -0600
+++ b/http/src/luan/modules/http/Server.luan	Wed May 27 22:19:46 2015 -0600
@@ -2,7 +2,7 @@
 local Io = require "luan:Io"
 local Package = require "luan:Package"
 local Http = require "luan:http/Http"
-require "luan:logging/Logging"  -- initialize logging
+require "luan:logging/init"  -- initialize logging
 
 java()
 local Server = require "java:org.eclipse.jetty.server.Server"
diff -r f99c79b0b426 -r 9bf9ad733827 logging/src/luan/modules/logging/Logging.luan
--- a/logging/src/luan/modules/logging/Logging.luan	Wed May 27 22:01:40 2015 -0600
+++ b/logging/src/luan/modules/logging/Logging.luan	Wed May 27 22:19:46 2015 -0600
@@ -52,8 +52,6 @@
 	end
 end
 
-M.init()
-
 
 local function to_luan_logger(log4j_logger)
 	local tbl = {}
diff -r f99c79b0b426 -r 9bf9ad733827 logging/src/luan/modules/logging/init.luan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/logging/src/luan/modules/logging/init.luan	Wed May 27 22:19:46 2015 -0600
@@ -0,0 +1,2 @@
+require "luan:logging/Logging".init()
+return true