Compare commits
18 Commits
Author | SHA1 | Date |
---|---|---|
Denis Knauf | d1694702b8 | |
Denis Knauf | 6d2157caff | |
Denis Knauf | 25ff6d52d8 | |
Denis Knauf | 595f4ac6f1 | |
Denis Knauf | 8edb8ccdea | |
Denis Knauf | 26853e31e2 | |
Denis Knauf | fd8860766b | |
Denis Knauf | 3874aa0e43 | |
Denis Knauf | 3b20edf5cf | |
Denis Knauf | e04b61dd4a | |
Denis Knauf | eba19017af | |
Denis Knauf | 1108a9331c | |
Denis Knauf | e9cba75802 | |
Denis Knauf | 57896e3145 | |
Denis Knauf | 4e803a26e7 | |
Denis Knauf | 95417dec97 | |
Denis Knauf | eee7d885cc | |
Denis Knauf | 6c9b038de0 |
2
Rakefile
2
Rakefile
|
@ -43,7 +43,7 @@ end
|
|||
|
||||
#task :default => :test
|
||||
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
Rake::RDocTask.new do |rdoc|
|
||||
if File.exist? 'VERSION'
|
||||
version = File.read 'VERSION'
|
||||
|
|
|
@ -2,7 +2,10 @@ require 'json'
|
|||
|
||||
class Object
|
||||
def to_semlogger
|
||||
[self.class.name.to_sym, self.respond_to?( :serializable_hash) ? self.serializable_hash : self ]
|
||||
[
|
||||
self.class.name.to_sym,
|
||||
self.respond_to?( :serializable_hash) ? self.serializable_hash : self
|
||||
]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -27,7 +30,30 @@ end
|
|||
end
|
||||
|
||||
class Semlogger < ::Logger
|
||||
class CustomType
|
||||
class Base
|
||||
class <<self
|
||||
attr_accessor :logger
|
||||
end
|
||||
attr_accessor :logger
|
||||
|
||||
def initialize
|
||||
@logger = self.class.logger
|
||||
end
|
||||
|
||||
def add severity, logger = nil, &block
|
||||
(logger || @logger).add severity, self, &block
|
||||
end
|
||||
|
||||
::Semlogger::Severity.constants.each do |severity|
|
||||
module_eval <<-EOC, __FILE__, __LINE__+1
|
||||
def #{severity.downcase} *a, &e
|
||||
add #{::Semlogger::Severity.const_get severity}, *a, &e
|
||||
end
|
||||
EOC
|
||||
end
|
||||
end
|
||||
|
||||
class CustomType < Base
|
||||
def initialize name, *obj
|
||||
@name, @obj = name.to_s.to_sym, obj
|
||||
end
|
||||
|
@ -38,17 +64,36 @@ class Semlogger < ::Logger
|
|||
end
|
||||
|
||||
attr_accessor :logdev, :level, :progname
|
||||
|
||||
# some libs use #log_level
|
||||
def log_level=( level) @level = level end
|
||||
def log_level() @level end
|
||||
|
||||
class <<self
|
||||
attr_accessor :progname
|
||||
attr_accessor :progname, :logger
|
||||
|
||||
def custom *a
|
||||
CustomType.new *a
|
||||
def new_rails_logger config, logdev = nil
|
||||
require 'semlogger/rack'
|
||||
logdev ||= ::Rails.root.join 'log', "#{::Rails.env.to_s.gsub('%', '%%')}.%Y-%m-%d.%$.log"
|
||||
logdev = logdev.to_s
|
||||
logger = nil
|
||||
if Rails.env.production?
|
||||
logger = new logdev
|
||||
logger.level = Semlogger::INFO
|
||||
elsif Rails.env.development?
|
||||
logger = new Semlogger::Multiplex.new( Semlogger::FInfo.new( Semlogger::Printer.new), Semlogger::Writer.new( logdev))
|
||||
logger.level = Semlogger::DEBUG
|
||||
else
|
||||
logger = new logdev
|
||||
logger.level = Semlogger::DEBUG
|
||||
end
|
||||
config.middleware.swap Rails::Rack::Logger, Semlogger::Rack, [], {reqid: :uuid}
|
||||
config.logger = logger
|
||||
end
|
||||
end
|
||||
|
||||
def custom *a
|
||||
CustomType.new *a
|
||||
def custom( *a) CustomType.new( *a).tap {|t| t.logger = self.logger } end
|
||||
end
|
||||
def custom( *a) CustomType.new( *a).tap {|t| t.logger = self } end
|
||||
|
||||
@@progname = nil
|
||||
|
||||
|
@ -58,21 +103,21 @@ class Semlogger < ::Logger
|
|||
end
|
||||
@progname = a[0] || @@progname
|
||||
@level, @data, @tags, @logdev = DEBUG, {}, [], logdev
|
||||
self.class.logger = self if !self.class.logger && self.class.logger.is_a?( Semlogger::Default)
|
||||
end
|
||||
|
||||
def tagged tags, &e
|
||||
@tags += tags
|
||||
def tagged *tags, &e
|
||||
@tags += tags.flatten.compact
|
||||
tags = tags.size
|
||||
yield
|
||||
ensure
|
||||
tags.times { @tags.pop }
|
||||
#tags.times { @tags.pop }
|
||||
@tags.slice! -tags .. -1
|
||||
end
|
||||
|
||||
def add severity, message = nil, progname = nil, &block
|
||||
severity ||= UNKNOWN
|
||||
if @logdev.nil? or severity < @level
|
||||
return true
|
||||
end
|
||||
return true if @logdev.nil? or severity < @level
|
||||
progname ||= @progname
|
||||
if message.nil?
|
||||
if block_given?
|
||||
|
@ -130,6 +175,11 @@ end
|
|||
|
||||
require 'semlogger/rotate'
|
||||
require 'semlogger/multiplex'
|
||||
require 'semlogger/rack'
|
||||
require 'semlogger/filter'
|
||||
require 'semlogger/writer'
|
||||
|
||||
class Semlogger
|
||||
class Default < Semlogger
|
||||
end
|
||||
self.logger ||= Default.new
|
||||
end
|
||||
|
|
|
@ -1,29 +1,43 @@
|
|||
class Semlogger::Rack < Rails::Rack::Logger
|
||||
def initialize app, tags = nil, data = nil
|
||||
super app, tags
|
||||
@data = data
|
||||
@data = data || {}
|
||||
end
|
||||
|
||||
def call_app env
|
||||
request = ActionDispatch::Request.new env
|
||||
def call_app request, env
|
||||
path = request.filtered_path
|
||||
Rails.logger.info Semlogger.custom :connection, request.ip, Thread.current.object_id, request.request_method, path
|
||||
Rails.logger.custom( :connection, request.ip, Thread.current.object_id, request.request_method, path).info
|
||||
@app.call env
|
||||
ensure
|
||||
ActiveSupport::LogSubscriber.flush_all!
|
||||
end
|
||||
|
||||
def call env
|
||||
if @data
|
||||
Rails.logger.data( compute_data( env)) { super env }
|
||||
else
|
||||
super env
|
||||
request = ActionDispatch::Request.new env
|
||||
compute_tagged_ request do
|
||||
compute_data_ request do
|
||||
call_app request, env
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def compute_data env
|
||||
request = ActionDispatch::Request.new env
|
||||
def compute_tagged_ request
|
||||
if Rails.logger.respond_to? :tagged
|
||||
Rails.logger.tagged( compute_tags( request)) { yield }
|
||||
else
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
||||
def compute_data_ request
|
||||
if Rails.logger.respond_to? :data
|
||||
Rails.logger.data( compute_data( request)) { yield }
|
||||
else
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
||||
def compute_data request
|
||||
data = @data.dup
|
||||
data.each do |k, v|
|
||||
case v
|
||||
|
|
|
@ -3,7 +3,11 @@ end
|
|||
|
||||
class Semlogger::Writer < Semlogger::Output
|
||||
def initialize logdev = nil
|
||||
@logdev = logdev || ::Semlogger::Rotate.new( ::Rails.root.join( 'log', ::Rails.env).to_s.gsub('%', '%%') + '.%Y-%m-%d.%$.log')
|
||||
@logdev = case logdev
|
||||
when String then ::Semlogger::Rotate.new logdev
|
||||
when nil then ::Semlogger::Rotate.new "log/#{File.basename $0}.%Y-%m-%d.%$.log"
|
||||
else logdev
|
||||
end
|
||||
end
|
||||
|
||||
def add severity, time, progname, data, tags, message
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
|
||||
Gem::Specification.new do |s|
|
||||
s.name = %q{semlogger}
|
||||
s.version = "0.0.5"
|
||||
s.name = "semlogger"
|
||||
s.version = "0.0.10"
|
||||
|
||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||
s.authors = ["Denis Knauf"]
|
||||
s.date = %q{2012-09-17}
|
||||
s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)}
|
||||
s.date = "2012-11-21"
|
||||
s.description = "(Semi-)Structured Logger for Ruby (and Rails)"
|
||||
s.email = ["Denis.Knauf@gmail.com"]
|
||||
s.extra_rdoc_files = [
|
||||
"LICENSE",
|
||||
|
@ -30,13 +30,12 @@ Gem::Specification.new do |s|
|
|||
"lib/semlogger/tailer.rb",
|
||||
"lib/semlogger/writer.rb"
|
||||
]
|
||||
s.homepage = %q{http://github.com/DenisKnauf/semlogger}
|
||||
s.homepage = "http://github.com/DenisKnauf/semlogger"
|
||||
s.require_paths = ["lib"]
|
||||
s.rubygems_version = %q{1.3.7}
|
||||
s.summary = %q{(Semi-)Structured Logger}
|
||||
s.rubygems_version = "1.8.23"
|
||||
s.summary = "(Semi-)Structured Logger"
|
||||
|
||||
if s.respond_to? :specification_version then
|
||||
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
||||
s.specification_version = 3
|
||||
|
||||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
||||
|
|
Loading…
Reference in New Issue