clogger 0.2.0 → 0.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.2.0.GIT
+DEF_VER=v0.3.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -96,7 +96,7 @@ $(release_changes):
 	$(RAKE) -s release_changes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-	GIT_URL=$(GIT_URL) $(RUBY) -s release_notes > $@+
+	GIT_URL=$(GIT_URL) $(RAKE) -s release_notes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release

data/README

@@ -20,9 +20,9 @@ is customizable so you can specify exactly which fields to log.
     " (double quote)
     all bytes in the range of \x00-\x1F
 
-* multi-instance capable and reentrant.  You can use Clogger in a
-  multi-threaded server, and even multiple Cloggers logging to
-  different locations and different formats in the same process.
+* multi-instance capable and (optionally) reentrant.  You can use
+  Clogger in a multi-threaded server, and even multiple Cloggers logging
+  to different locations and different formats in the same process.
 
 == SYNOPSIS
 
@@ -31,7 +31,8 @@ Clogger may be loaded as Rack middleware in your config.ru:
   require "clogger"
   use Clogger,
       :format => Clogger::Format::Combined,
-      :logger => ::File.open("/path/to/log", "ab")
+      :logger => ::File.open("/path/to/log", "ab"),
+      :reentrant => true
   run YourApplication.new
 
 If you're using Rails 2.3.x or later, in your config/environment.rb
@@ -39,7 +40,8 @@ somewhere inside the "Rails::Initializer.run do |config|" block:
 
   config.middleware.use 'Clogger',
       :format => Clogger::Format::Combined,
-      :logger => ::File.open("/path/to/log", "ab")
+      :logger => ::File.open("/path/to/log", "ab"),
+      :reentrant => false
 
 == VARIABLES
 

data/Rakefile

@@ -44,6 +44,7 @@ def tags
 end
 
 cgit_url = "http://git.bogomips.org/cgit/clogger.git"
+git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/clogger.git'
 
 desc 'prints news as an Atom feed'
 task :news_atom do
@@ -104,8 +105,6 @@ desc "print release notes for Rubyforge"
 task :release_notes do
   require 'rubygems'
 
-  git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/clogger.git'
-
   spec = Gem::Specification.load('clogger.gemspec')
   puts spec.description.strip
   puts ""
@@ -145,7 +144,7 @@ task :raa_update do
     :category_minor => 'Rack',
     :url => s.homepage,
     :download => 'http://rubyforge.org/frs/?group_id=8896',
-    :license => 'LGPLv3',
+    :license => 'LGPL',
     :description_style => 'Plain',
     :description => desc,
     :pass => password,

data/ext/clogger_ext/clogger.c

@@ -599,6 +599,19 @@ static VALUE clogger_init(int argc, VALUE *argv, VALUE self)
 		tmp = rb_hash_aref(o, ID2SYM(rb_intern("format")));
 		if (!NIL_P(tmp))
 			fmt = tmp;
+
+		tmp = rb_hash_aref(o, ID2SYM(rb_intern("reentrant")));
+		switch (TYPE(tmp)) {
+		case T_TRUE:
+			c->reentrant = 1;
+			break;
+		case T_FALSE:
+			c->reentrant = 0;
+		case T_NIL:
+			break;
+		default:
+			rb_raise(rb_eArgError, ":reentrant must be boolean");
+		}
 	}
 
 	init_buffers(c);

data/lib/clogger.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 class Clogger
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   OP_LITERAL = 0
   OP_REQUEST = 1

data/lib/clogger/pure.rb

@@ -13,7 +13,7 @@ class Clogger
     (@logger.sync = true) rescue nil
     @fmt_ops = compile_format(opts[:format] || Format::Common, opts)
     @wrap_body = need_wrap_body?(@fmt_ops)
-    @reentrant = nil
+    @reentrant = opts[:reentrant]
     @need_resp = need_response_headers?(@fmt_ops)
     @body_bytes_sent = 0
   end
@@ -28,7 +28,7 @@ class Clogger
     status, headers, body = resp
     headers = Rack::Utils::HeaderHash.new(headers) if @need_resp
     if @wrap_body
-      @reentrant = env['rack.multithread']
+      @reentrant = env['rack.multithread'] if @reentrant.nil?
       @env, @status, @headers, @body = env, status, headers, body
       return [ status, headers, @reentrant ? self.dup : self ]
     end

data/test/test_clogger.rb

@@ -545,4 +545,46 @@ class TestClogger < Test::Unit::TestCase
     assert_equal :foo, body.close
   end
 
+  def test_clogger_auto_reentrant_true
+    s = ''
+    body = []
+    app = lambda { |env| [302, [ %w(a) ], body ] }
+    cl = Clogger.new(app, :logger => s, :format => "$request_time")
+    @req['rack.multithread'] = true
+    status, headers, body = cl.call(@req)
+    assert cl.reentrant?
+  end
+
+  def test_clogger_auto_reentrant_false
+    s = ''
+    body = []
+    app = lambda { |env| [302, [ %w(a) ], body ] }
+    cl = Clogger.new(app, :logger => s, :format => "$request_time")
+    @req['rack.multithread'] = false
+    status, headers, body = cl.call(@req)
+    assert ! cl.reentrant?
+  end
+
+  def test_clogger_auto_reentrant_forced_true
+    s = ''
+    body = []
+    app = lambda { |env| [302, [ %w(a) ], body ] }
+    o = { :logger => s, :format => "$request_time", :reentrant => true }
+    cl = Clogger.new(app, o)
+    @req['rack.multithread'] = false
+    status, headers, body = cl.call(@req)
+    assert cl.reentrant?
+  end
+
+  def test_clogger_auto_reentrant_forced_false
+    s = ''
+    body = []
+    app = lambda { |env| [302, [ %w(a) ], body ] }
+    o = { :logger => s, :format => "$request_time", :reentrant => false }
+    cl = Clogger.new(app, o)
+    @req['rack.multithread'] = true
+    status, headers, body = cl.call(@req)
+    assert ! cl.reentrant?
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - cloggers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +00:00
+date: 2010-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency