comparison logging/src/luan/modules/logging/Logging.luan @ 376:0a75ed73bccc

partly revert rev 538c19ad1272 (logging)
author Franklin Schmidt <fschmidt@gmail.com>
date Sat, 18 Apr 2015 19:57:42 -0600
parents 538c19ad1272
children 92c3d22745b8
comparison
equal deleted inserted replaced
375:e2e70d27c258 376:0a75ed73bccc
2 local Logger = require "java:org.apache.log4j.Logger" 2 local Logger = require "java:org.apache.log4j.Logger"
3 local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout" 3 local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout"
4 local ConsoleAppender = require "java:org.apache.log4j.ConsoleAppender" 4 local ConsoleAppender = require "java:org.apache.log4j.ConsoleAppender"
5 local Level = require "java:org.apache.log4j.Level" 5 local Level = require "java:org.apache.log4j.Level"
6 local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender" 6 local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender"
7 local LuanLogger = require "java:luan.modules.logging.LuanLogger"
7 8
8 9
9 layout = "%d %-5p %c - %m%n" 10 layout = "%d %-5p %c - %m%n"
10 11
11 level = "INFO" 12 level = "INFO"
54 55
55 56
56 local function to_luan_logger(log4j_logger) 57 local function to_luan_logger(log4j_logger)
57 local tbl = {} 58 local tbl = {}
58 59
59 tbl.error = log4j_logger.error 60 local luanLogger = LuanLogger.new(log4j_logger)
60 tbl.warn = log4j_logger.warn 61 tbl.error = luanLogger.error
61 tbl.info = log4j_logger.info 62 tbl.warn = luanLogger.warn
62 tbl.debug = log4j_logger.debug 63 tbl.info = luanLogger.info
64 tbl.debug = luanLogger.debug
63 65
64 function tbl.get_level() 66 function tbl.get_level()
65 local level = log4j_logger.getLevel() 67 local level = log4j_logger.getLevel()
66 return level and level.toString() 68 return level and level.toString()
67 end 69 end