Mercurial Hosting > luan
diff 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 |
line wrap: on
line diff
--- a/src/luan/host/init.luan Mon Mar 02 15:09:10 2020 -0700 +++ b/src/luan/host/init.luan Sun Mar 08 14:11:30 2020 -0600 @@ -3,6 +3,8 @@ local do_file = Luan.do_file or error() local String = require "luan:String.luan" local gsub = String.gsub or error() +local Number = require "luan:Number.luan" +local long = Number.long or error() local dir, domain = ... @@ -10,30 +12,34 @@ -- logging +local one_mb = long(1024*1024) + do require "java" - local Log4j = require "java:luan.modules.logging.Log4j" - local Level = require "java:org.apache.log4j.Level" - local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout" - local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender" + local LuanLogger = require "java:luan.modules.logging.LuanLogger" + local Layouts = require "java:goodjava.logger.Layouts" + local DateLayout = require "java:goodjava.logger.DateLayout" + local ListLayout = require "java:goodjava.logger.ListLayout" + local Level = require "java:goodjava.logger.Level" + local RollingFileAppender = require "java:goodjava.logger.RollingFileAppender" + local LevelAppender = require "java:goodjava.logger.LevelAppender" + local ListAppender = require "java:goodjava.logger.ListAppender" - local logger = Log4j.getRootLogger() - Log4j.removeAllAppenders(logger) - local layout = EnhancedPatternLayout.new("%d %-5p %c - %m%n") + local layout = ListLayout.new(DateLayout.new("yyyy-MM-dd HH:mm:ss,SSS")," ",Layouts.LEVEL_PADDED," ",Layouts.LOGGER," - ",Layouts.MESSAGE,"\n",Layouts.THROWABLE) local log_dir = dir.."/site/private/local/logs/" - local function add_appender(file,level) + local function new_appender(file,level) local appender = RollingFileAppender.new(layout, log_dir..file) - appender.setMaxFileSize("1MB") - logger.addAppender(appender) - if level ~= logger.getEffectiveLevel() then - appender.setThreshold(level) - end + appender.maxFileSize = one_mb + appender = LevelAppender.new(appender,level) + return appender end - add_appender("error.log",Level.ERROR) - add_appender("warn.log",Level.WARN) - add_appender("info.log",Level.INFO) + local err = new_appender("error.log",Level.ERROR) + local warn = new_appender("warn.log",Level.WARN) + local info = new_appender("info.log",Level.INFO) + local appender = ListAppender.new(err,warn,info) + LuanLogger.configure(appender) end