From c44010dd64ac612050015a283832651d7707c4a7 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 17 Sep 2012 13:46:57 +0200 Subject: [PATCH 01/20] v0.0.5 rotate: close-bedingung fixed --- VERSION | 2 +- lib/semlogger/rotate.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 81340c7..bbdeab6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.4 +0.0.5 diff --git a/lib/semlogger/rotate.rb b/lib/semlogger/rotate.rb index 4ec32c1..9656bcb 100644 --- a/lib/semlogger/rotate.rb +++ b/lib/semlogger/rotate.rb @@ -9,7 +9,7 @@ class Semlogger::Rotate def open_if name = Time.now.strftime( @filename).gsub /%\$/, $$.to_s - @file.close if @file and name != @file.path + close if @file and name != @file.path @file = File.open name, 'a' unless @file @file end From d4dd5dfd0e529a9a1b36302fee52882becd2f606 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 17 Sep 2012 13:47:10 +0200 Subject: [PATCH 02/20] Regenerate gemspec for version 0.0.5 --- semlogger.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index 66d4b25..fe4d404 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = %q{semlogger} - s.version = "0.0.4" + s.version = "0.0.5" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Denis Knauf"] From 6c9b038de0c8797d9f1aca1ae8c8c72f277de391 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 15 Oct 2012 16:08:35 +0200 Subject: [PATCH 03/20] tagged: expects not an array anymore. list your tags naturaly: tagged(:a,:b). CustomType: attr logger and severity-methods added for simplier custom loglines: logger.custom( :conn, ip, port).info --- lib/semlogger.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index c74df04..678e227 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -28,6 +28,8 @@ end class Semlogger < ::Logger class CustomType + attr_accessor :logger + def initialize name, *obj @name, @obj = name.to_s.to_sym, obj end @@ -35,19 +37,26 @@ class Semlogger < ::Logger def to_semlogger [@name] + @obj end + + def add severity, progname = nil, &block + @logger.add severity, self, progname = nil, &block + end + ::Semlogger::Severity.constants.each do |severity| + module_eval "def #{severity.downcase}( *a, &e) add #{::Semlogger::Severity.const_get severity}, *a, &e end", __FILE__, __LINE__ + end end attr_accessor :logdev, :level, :progname class < Date: Mon, 15 Oct 2012 16:15:30 +0200 Subject: [PATCH 04/20] v0.0.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bbdeab6..1750564 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.5 +0.0.6 From 95417dec9791b1f53d2a44a207371009b189d2c1 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 15 Oct 2012 16:15:42 +0200 Subject: [PATCH 05/20] Regenerate gemspec for version 0.0.6 --- semlogger.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index fe4d404..d30b2b6 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{semlogger} - s.version = "0.0.5" + s.version = "0.0.6" 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.date = %q{2012-10-15} s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)} s.email = ["Denis.Knauf@gmail.com"] s.extra_rdoc_files = [ From 4e803a26e74b4bb3e2e8fff7f6428e82f05af851 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Wed, 17 Oct 2012 23:14:09 +0200 Subject: [PATCH 06/20] Semlogger::Base for types added. --- lib/semlogger.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index 678e227..79405d2 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -27,9 +27,19 @@ end end class Semlogger < ::Logger - class CustomType + class Base attr_accessor :logger + def add severity, progname = nil, &block + @logger.add severity, self, progname = nil, &block + end + + ::Semlogger::Severity.constants.each do |severity| + module_eval "def #{severity.downcase}( *a, &e) add #{::Semlogger::Severity.const_get severity}, *a, &e end", __FILE__, __LINE__ + end + end + + class CustomType < Base def initialize name, *obj @name, @obj = name.to_s.to_sym, obj end @@ -37,13 +47,6 @@ class Semlogger < ::Logger def to_semlogger [@name] + @obj end - - def add severity, progname = nil, &block - @logger.add severity, self, progname = nil, &block - end - ::Semlogger::Severity.constants.each do |severity| - module_eval "def #{severity.downcase}( *a, &e) add #{::Semlogger::Severity.const_get severity}, *a, &e end", __FILE__, __LINE__ - end end attr_accessor :logdev, :level, :progname From 57896e3145f65c310917ec18d7f44382df399be9 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Wed, 17 Oct 2012 23:14:58 +0200 Subject: [PATCH 07/20] v0.0.7 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1750564..5a5831a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.6 +0.0.7 From e9cba75802c57b3675cedb8108c76a68d66453c7 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Wed, 17 Oct 2012 23:15:12 +0200 Subject: [PATCH 08/20] Regenerate gemspec for version 0.0.7 --- semlogger.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index d30b2b6..4d4d3f7 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{semlogger} - s.version = "0.0.6" + s.version = "0.0.7" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Denis Knauf"] - s.date = %q{2012-10-15} + s.date = %q{2012-10-17} s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)} s.email = ["Denis.Knauf@gmail.com"] s.extra_rdoc_files = [ From 1108a9331c9050826bb4e5aa2a8a92cf28227c81 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Thu, 18 Oct 2012 19:34:04 +0200 Subject: [PATCH 09/20] lesser deps to Rails (or no deps) --- lib/semlogger.rb | 41 ++++++++++++++++++++++++++++------------- lib/semlogger/writer.rb | 6 +++++- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index 79405d2..b14c609 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -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 @@ -28,14 +31,25 @@ end class Semlogger < ::Logger class Base + class < Date: Fri, 19 Oct 2012 11:18:20 +0200 Subject: [PATCH 10/20] To use Semlogger::Rack, require "semlogger/rack". It will not be required by default anymore. --- lib/semlogger.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index b14c609..fbf7d45 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -151,7 +151,6 @@ end require 'semlogger/rotate' require 'semlogger/multiplex' -require 'semlogger/rack' require 'semlogger/filter' require 'semlogger/writer' From e04b61dd4a17d43a3124d6dba11a71f5b8a22806 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Fri, 19 Oct 2012 11:32:29 +0200 Subject: [PATCH 11/20] Semlogger.new_rails_logger(config) can be used in config/environment.rb for initialize Semlogger for Rails. Different behaviour for different environments. --- lib/semlogger.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index fbf7d45..a710827 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -66,6 +66,25 @@ class Semlogger < ::Logger attr_accessor :logdev, :level, :progname class < Date: Fri, 19 Oct 2012 11:38:12 +0200 Subject: [PATCH 12/20] ... fixes --- lib/semlogger.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index a710827..81980c3 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -69,17 +69,17 @@ class Semlogger < ::Logger def new_rails_logger config require 'semlogger/rack' - logdev = ::Rails.root.join( 'log', "#{::Rails.env.to_s.gsub('%', '%%')}.%Y-%m-%d.%$.log") + logdev = ::Rails.root.join( 'log', "#{::Rails.env.to_s.gsub('%', '%%')}.%Y-%m-%d.%$.log").to_s logger = nil if Rails.env.production? - logger.new logdev - logger.level = INFO + 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 = DEBUG + 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 = DEBUG + logger = new logdev + logger.level = Semlogger::DEBUG end config.middleware.swap Rails::Rack::Logger, Semlogger::Rack, [], {reqid: :uuid} config.logger = logger From 3874aa0e4370910234e72b0ed1fa8f1b41c5f789 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Fri, 19 Oct 2012 11:38:57 +0200 Subject: [PATCH 13/20] v0.0.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5a5831a..d169b2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.7 +0.0.8 From fd8860766b7ec1ef0809ed71f858ff5c621ca944 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Fri, 19 Oct 2012 11:39:07 +0200 Subject: [PATCH 14/20] Regenerate gemspec for version 0.0.8 --- semlogger.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index 4d4d3f7..61adc52 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{semlogger} - s.version = "0.0.7" + s.version = "0.0.8" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Denis Knauf"] - s.date = %q{2012-10-17} + s.date = %q{2012-10-19} s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)} s.email = ["Denis.Knauf@gmail.com"] s.extra_rdoc_files = [ From 26853e31e23cd6c9b27d7095d66699e06a151f36 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 19 Nov 2012 17:07:39 +0100 Subject: [PATCH 15/20] #log_level added, rack-logger 3.2.9 -compatible --- lib/semlogger.rb | 9 ++++++--- lib/semlogger/rack.rb | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/semlogger.rb b/lib/semlogger.rb index 81980c3..a4a071d 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -64,6 +64,11 @@ 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 < Date: Mon, 19 Nov 2012 17:08:00 +0100 Subject: [PATCH 16/20] v0.0.9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d169b2f..c5d54ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.8 +0.0.9 From 595f4ac6f1b53339440c9b21cef89e58cfb25e1d Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 19 Nov 2012 17:33:17 +0100 Subject: [PATCH 17/20] rdoc-deprecation fixed --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 68654fb..e43cfd8 100644 --- a/Rakefile +++ b/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' From 25ff6d52d8ec20aed6cad9ef1d639075caab62ec Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 19 Nov 2012 17:33:37 +0100 Subject: [PATCH 18/20] Regenerate gemspec for version 0.0.9 --- semlogger.gemspec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index 61adc52..05da71c 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -4,13 +4,13 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = %q{semlogger} - s.version = "0.0.8" + s.name = "semlogger" + s.version = "0.0.9" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Denis Knauf"] - s.date = %q{2012-10-19} - s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)} + s.date = "2012-11-19" + 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 From 6d2157caffc406475feed4ef7c8fb0818591a62d Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Wed, 21 Nov 2012 16:11:34 +0100 Subject: [PATCH 19/20] #new_rails_logger: custom logdev-template. Semlogger::Rack: #call will never super anymore. --- VERSION | 2 +- lib/semlogger.rb | 10 ++++++---- lib/semlogger/rack.rb | 31 +++++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index c5d54ec..7c1886b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.9 +0.0.10 diff --git a/lib/semlogger.rb b/lib/semlogger.rb index a4a071d..2004a68 100644 --- a/lib/semlogger.rb +++ b/lib/semlogger.rb @@ -72,9 +72,10 @@ class Semlogger < ::Logger class < Date: Wed, 21 Nov 2012 16:11:47 +0100 Subject: [PATCH 20/20] Regenerate gemspec for version 0.0.10 --- semlogger.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semlogger.gemspec b/semlogger.gemspec index 05da71c..da01a17 100644 --- a/semlogger.gemspec +++ b/semlogger.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = "semlogger" - s.version = "0.0.9" + 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 = "2012-11-19" + s.date = "2012-11-21" s.description = "(Semi-)Structured Logger for Ruby (and Rails)" s.email = ["Denis.Knauf@gmail.com"] s.extra_rdoc_files = [