diff options
| author | Eric Wong <normalperson@yhbt.net> | 2010-04-21 15:31:58 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-04-21 16:23:09 -0700 |
| commit | a0ee3ba2d08acb423a1cbc4a5ae862bd40c4b914 (patch) | |
| tree | ca4268918acaaed138291de6a6363748b59e3adb | |
| parent | 9c6fd3814b6bed2772fc540e7824febe85e9b046 (diff) | |
| download | clogger-a0ee3ba2d08acb423a1cbc4a5ae862bd40c4b914.tar.gz | |
This quiets down warnings when used with RubyGems loaders such as Isolate and Bundler where the HTTP server already loaded Rack.
| -rw-r--r-- | ext/clogger_ext/clogger.c | 20 | ||||
| -rw-r--r-- | lib/clogger.rb | 2 | ||||
| -rw-r--r-- | lib/clogger/pure.rb | 5 |
3 files changed, 11 insertions, 16 deletions
diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c index 93c609d..453ff48 100644 --- a/ext/clogger_ext/clogger.c +++ b/ext/clogger_ext/clogger.c @@ -776,21 +776,10 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig) #define CONST_GLOBAL_STR(val) CONST_GLOBAL_STR2(val, #val) -static void init_rack_utils_header_hash(void) -{ - VALUE mRack, mUtils; -#if 0 - extra double quotes below are to disable rdoc (and so is avoiding comments) - let me know if there is a better way... -#endif - rb_require("rack"); - mRack = rb_define_module("Rack"""); - mUtils = rb_define_module_under(mRack, "Utils"""); - cHeaderHash = rb_define_class_under(mUtils, "HeaderHash""", rb_cHash); -} - void Init_clogger_ext(void) { + VALUE tmp; + ltlt_id = rb_intern("<<"); call_id = rb_intern("call"); each_id = rb_intern("each"); @@ -826,5 +815,8 @@ void Init_clogger_ext(void) CONST_GLOBAL_STR2(space, " "); CONST_GLOBAL_STR2(question_mark, "?"); CONST_GLOBAL_STR2(rack_request_cookie_hash, "rack.request.cookie_hash"); - init_rack_utils_header_hash(); + + tmp = rb_const_get(rb_cObject, rb_intern("Rack")); + tmp = rb_const_get(tmp, rb_intern("Utils")); + cHeaderHash = rb_const_get(tmp, rb_intern("HeaderHash")); } diff --git a/lib/clogger.rb b/lib/clogger.rb index 641d5c5..8567c91 100644 --- a/lib/clogger.rb +++ b/lib/clogger.rb @@ -1,4 +1,6 @@ # -*- encoding: binary -*- +autoload :Rack, 'rack' + class Clogger VERSION = '0.3.2' diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb index b871c62..e9a8e6a 100644 --- a/lib/clogger/pure.rb +++ b/lib/clogger/pure.rb @@ -1,13 +1,14 @@ # -*- encoding: binary -*- # :stopdoc: -require 'rack' - # Not at all optimized for performance, this was written based on # the original C extension code so it's not very Ruby-ish... class Clogger def initialize(app, opts = {}) + # trigger autoload to avoid thread-safety issues later on + Rack::Utils::HeaderHash.new({}) + @app = app @logger = opts[:logger] (@logger.sync = true) rescue nil |