From 26853e31e23cd6c9b27d7095d66699e06a151f36 Mon Sep 17 00:00:00 2001
From: Denis Knauf <mkv5bu@sweb1.mobilkom.at>
Date: Mon, 19 Nov 2012 17:07:39 +0100
Subject: [PATCH 1/6] #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 <<self
 		attr_accessor :progname, :logger
 
@@ -110,9 +115,7 @@ class Semlogger < ::Logger
 
 	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?
diff --git a/lib/semlogger/rack.rb b/lib/semlogger/rack.rb
index 2b6f10d..712c14c 100644
--- a/lib/semlogger/rack.rb
+++ b/lib/semlogger/rack.rb
@@ -4,10 +4,9 @@ class Semlogger::Rack < Rails::Rack::Logger
 		@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
+		Semlogger.custom( :connection, request.ip, Thread.current.object_id, request.request_method, path).info
 		@app.call env
 	ensure
 		ActiveSupport::LogSubscriber.flush_all!

From 8edb8ccdeadf62dbe3a4c0d750d7fb7c042c9457 Mon Sep 17 00:00:00 2001
From: Denis Knauf <mkv5bu@sweb1.mobilkom.at>
Date: Mon, 19 Nov 2012 17:08:00 +0100
Subject: [PATCH 2/6] 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 <mkv5bu@sweb1.mobilkom.at>
Date: Mon, 19 Nov 2012 17:33:17 +0100
Subject: [PATCH 3/6] 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 <mkv5bu@sweb1.mobilkom.at>
Date: Mon, 19 Nov 2012 17:33:37 +0100
Subject: [PATCH 4/6] 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 <mkv5bu@sweb1.mobilkom.at>
Date: Wed, 21 Nov 2012 16:11:34 +0100
Subject: [PATCH 5/6] #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 <<self
 		attr_accessor :progname, :logger
 
-		def new_rails_logger config
+		def new_rails_logger config, logdev = nil
 			require 'semlogger/rack'
-			logdev = ::Rails.root.join( 'log', "#{::Rails.env.to_s.gsub('%', '%%')}.%Y-%m-%d.%$.log").to_s
+			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
@@ -106,11 +107,12 @@ class Semlogger < ::Logger
 	end
 
 	def tagged *tags, &e
-		@tags += tags
+		@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
diff --git a/lib/semlogger/rack.rb b/lib/semlogger/rack.rb
index 712c14c..57d3298 100644
--- a/lib/semlogger/rack.rb
+++ b/lib/semlogger/rack.rb
@@ -1,28 +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 request, env
 		path = request.filtered_path
-		Semlogger.custom( :connection, request.ip, Thread.current.object_id, request.request_method, path).info
+		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

From d1694702b8071ac2d7f83c2e8199fcae9c7d2d68 Mon Sep 17 00:00:00 2001
From: Denis Knauf <mkv5bu@sweb1.mobilkom.at>
Date: Wed, 21 Nov 2012 16:11:47 +0100
Subject: [PATCH 6/6] 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 = [