comparison src/luan/host/init.luan @ 1454:219f2b937f2b

remove log4j
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 08 Mar 2020 14:11:30 -0600
parents 94a6a209d4e2
children f67f972bd648
comparison
equal deleted inserted replaced
1453:928be2a4d565 1454:219f2b937f2b
1 local Luan = require "luan:Luan.luan" 1 local Luan = require "luan:Luan.luan"
2 local error = Luan.error 2 local error = Luan.error
3 local do_file = Luan.do_file or error() 3 local do_file = Luan.do_file or error()
4 local String = require "luan:String.luan" 4 local String = require "luan:String.luan"
5 local gsub = String.gsub or error() 5 local gsub = String.gsub or error()
6 local Number = require "luan:Number.luan"
7 local long = Number.long or error()
6 8
7 9
8 local dir, domain = ... 10 local dir, domain = ...
9 11
10 12
11 -- logging 13 -- logging
12 14
15 local one_mb = long(1024*1024)
16
13 do 17 do
14 require "java" 18 require "java"
15 local Log4j = require "java:luan.modules.logging.Log4j" 19 local LuanLogger = require "java:luan.modules.logging.LuanLogger"
16 local Level = require "java:org.apache.log4j.Level" 20 local Layouts = require "java:goodjava.logger.Layouts"
17 local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout" 21 local DateLayout = require "java:goodjava.logger.DateLayout"
18 local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender" 22 local ListLayout = require "java:goodjava.logger.ListLayout"
23 local Level = require "java:goodjava.logger.Level"
24 local RollingFileAppender = require "java:goodjava.logger.RollingFileAppender"
25 local LevelAppender = require "java:goodjava.logger.LevelAppender"
26 local ListAppender = require "java:goodjava.logger.ListAppender"
19 27
20 local logger = Log4j.getRootLogger() 28 local layout = ListLayout.new(DateLayout.new("yyyy-MM-dd HH:mm:ss,SSS")," ",Layouts.LEVEL_PADDED," ",Layouts.LOGGER," - ",Layouts.MESSAGE,"\n",Layouts.THROWABLE)
21 Log4j.removeAllAppenders(logger)
22 local layout = EnhancedPatternLayout.new("%d %-5p %c - %m%n")
23 local log_dir = dir.."/site/private/local/logs/" 29 local log_dir = dir.."/site/private/local/logs/"
24 30
25 local function add_appender(file,level) 31 local function new_appender(file,level)
26 local appender = RollingFileAppender.new(layout, log_dir..file) 32 local appender = RollingFileAppender.new(layout, log_dir..file)
27 appender.setMaxFileSize("1MB") 33 appender.maxFileSize = one_mb
28 logger.addAppender(appender) 34 appender = LevelAppender.new(appender,level)
29 if level ~= logger.getEffectiveLevel() then 35 return appender
30 appender.setThreshold(level)
31 end
32 end 36 end
33 37
34 add_appender("error.log",Level.ERROR) 38 local err = new_appender("error.log",Level.ERROR)
35 add_appender("warn.log",Level.WARN) 39 local warn = new_appender("warn.log",Level.WARN)
36 add_appender("info.log",Level.INFO) 40 local info = new_appender("info.log",Level.INFO)
41 local appender = ListAppender.new(err,warn,info)
42 LuanLogger.configure(appender)
37 end 43 end
38 44
39 45
40 -- set vars 46 -- set vars
41 47