changeset 1201:7f4a12fb7716

remove logging/init.luan
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 04 Mar 2018 17:07:48 -0700
parents 1e351b0d385e
children d3a3ca116e42
files conv.txt src/luan/modules/Rpc.luan src/luan/modules/http/Server.luan src/luan/modules/http/serve.luan src/luan/modules/logging/init.luan src/luan/modules/lucene/Versioning.luan
diffstat 6 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
diff -r 1e351b0d385e -r 7f4a12fb7716 conv.txt
--- a/conv.txt	Thu Mar 01 16:28:18 2018 -0700
+++ b/conv.txt	Sun Mar 04 17:07:48 2018 -0700
@@ -11,3 +11,4 @@
 
 "Io.repr"
 "String.split"
+"logging/init.luan"
diff -r 1e351b0d385e -r 7f4a12fb7716 src/luan/modules/Rpc.luan
--- a/src/luan/modules/Rpc.luan	Thu Mar 01 16:28:18 2018 -0700
+++ b/src/luan/modules/Rpc.luan	Sun Mar 04 17:07:48 2018 -0700
@@ -19,7 +19,6 @@
 local Thread = require "luan:Thread.luan"
 local Table = require "luan:Table.luan"
 local unpack = Table.unpack or error()
-require "luan:logging/init.luan"  -- initialize logging
 local Logging = require "luan:logging/Logging.luan"
 local logger = Logging.logger "Rpc"
 
diff -r 1e351b0d385e -r 7f4a12fb7716 src/luan/modules/http/Server.luan
--- a/src/luan/modules/http/Server.luan	Thu Mar 01 16:28:18 2018 -0700
+++ b/src/luan/modules/http/Server.luan	Sun Mar 04 17:07:48 2018 -0700
@@ -10,7 +10,6 @@
 local Rpc = require "luan:Rpc.luan"
 local Thread = require "luan:Thread.luan"
 local Http = require "luan:http/Http.luan"
-require "luan:logging/init.luan"  -- initialize logging
 local Logging = require "luan:logging/Logging.luan"
 local logger = Logging.logger "http/Server"
 
diff -r 1e351b0d385e -r 7f4a12fb7716 src/luan/modules/http/serve.luan
--- a/src/luan/modules/http/serve.luan	Thu Mar 01 16:28:18 2018 -0700
+++ b/src/luan/modules/http/serve.luan	Sun Mar 04 17:07:48 2018 -0700
@@ -1,9 +1,12 @@
 local Io = require "luan:Io.luan"
 local Server = require "luan:http/Server.luan"
+local Logging = require "luan:logging/Logging.luan"
+
 
 if #{...} ~= 1 then
 	Io.stderr.write "usage: luan luan:http/serve dir\n"
 	return
 end
 
+Logging.init()
 Server.serve(...)
diff -r 1e351b0d385e -r 7f4a12fb7716 src/luan/modules/logging/init.luan
--- a/src/luan/modules/logging/init.luan	Thu Mar 01 16:28:18 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-require "luan:logging/Logging.luan".init()
-return true
diff -r 1e351b0d385e -r 7f4a12fb7716 src/luan/modules/lucene/Versioning.luan
--- a/src/luan/modules/lucene/Versioning.luan	Thu Mar 01 16:28:18 2018 -0700
+++ b/src/luan/modules/lucene/Versioning.luan	Sun Mar 04 17:07:48 2018 -0700
@@ -11,7 +11,6 @@
 local Table = require "luan:Table.luan"
 local copy = Table.copy or error()
 local Lucene = require "luan:lucene/Lucene.luan"
-require "luan:logging/init.luan"
 local Logging = require "luan:logging/Logging.luan"
 
 local logger = Logging.logger "lucene versioning"