clogger 2.0.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85af41cf4cb499a42ed7dbd0fa83176b587e7897
-  data.tar.gz: 363e963d851ffc22fc5947b859eac866c8c4f129
+SHA256:
+  metadata.gz: aa136dd8c34021aa1fe06bc527ddee6f0b2e3f1c6690292bba0566938efc11f4
+  data.tar.gz: c91b0dcb15b374bf6d89812b0dbcb002e9811b94a537465d96d5639191c55ab3
 SHA512:
-  metadata.gz: be050e0aa75fa61a11505d0bc677cfbcbbcf7675ecb87fed56e511636db0cb85fc76cfda5e041d8c8dfb2f46c8cae14e0a3e9f76e5fb1d6812eedd156001c56e
-  data.tar.gz: 22da33f482565c5d9fc63d3f6a3279ba3c02dac61d634cad93e5221132831d30a0cea0ba02a829be984061bfa0c28b96edd6ee6ad0c5762c6f27e5cbdf17fca9
+  metadata.gz: a3dc7e9f494fcd6acc52c82ba5f1c50d0bead5b5042189766f48f0229e595682c704f054a4d45ac5857a77a98c0c9d09e53c333f63a42e5c1232a2af9e1c1fe3
+  data.tar.gz: e72490ade869362cca1dd0df4cbd56c93c08a45f5baf32e88fd38b9a806b043286d1d58adaf3e31dae200a1f61f4e002b7f3e7bea15174d599af897609759cb2

data/.olddoc.yml

@@ -1,7 +1,16 @@
 ---
-rdoc_url: http://clogger.bogomips.org/
-cgit_url: http://bogomips.org/clogger.git
-git_url: git://bogomips.org/clogger.git
-public_email: clogger-public@bogomips.org
-private_email: clogger@bogomips.org
-ml_url: http://bogomips.org/clogger-public/
+rdoc_url: https://yhbt.net/clogger/
+cgit_url: https://yhbt.net/clogger.git
+git_url: git://yhbt.net/clogger.git
+public_email: clogger-public@yhbt.net
+ml_url:
+- https://yhbt.net/clogger-public/
+- http://ou63pmih66umazou.onion/clogger-public/
+- imaps://news.public-inbox.org/inbox.comp.lang.ruby.clogger.0
+- imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.clogger.0
+- nntps://news.public-inbox.org/inbox.comp.lang.ruby.clogger
+- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.clogger
+source_code:
+- git clone git://yhbt.net/clogger.git
+- git clone https://yhbt.net/clogger.git
+- torsocks git clone http://ou63pmih66umazou.onion/clogger.git

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,5 +1,5 @@
 all::
-RSYNC_DEST := clogger.bogomips.org:/srv/clogger/
+RSYNC_DEST := yhbt.net:/srv/yhbt/clogger/
 rfpackage := clogger
 include pkg.mk
 test-ext:

data/LICENSE

@@ -3,7 +3,7 @@ revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it under the terms of the GNU
 Lesser General Public License (LGPL) as published by the Free Software
-Foundation, version {2.1}[http://www.gnu.org/licenses/lgpl-2.1.txt] or
+Foundation, version {2.1}[https://www.gnu.org/licenses/lgpl-2.1.txt] or
 (at your option) any later version.
 
 clogger is distributed in the hope that it will be useful, but WITHOUT
@@ -12,5 +12,4 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+along with this library; if not, see https://www.gnu.org/licenses/

data/README

@@ -69,10 +69,12 @@ that receives a "<<" method:
 * $request_uri - the URI requested ($path_info?$query_string)
 * $request - the first line of the HTTP request
   ($request_method $request_uri $http_version)
-* $request_time, $request_time{PRECISION} - time taken for request
-  (including response body iteration).  PRECISION defaults to 3
-  (milliseconds) if not specified but may be specified anywhere from
-  0(seconds) to 6(microseconds).
+* $request_time, $request_time{PRECISION}, $request_time{POWER,PRECISION} -
+  time taken for request (including response body iteration). PRECISION
+  defaults to 3 (milliseconds) if not specified but may be specified
+  anywhere from 0(seconds) to 6(microseconds). POWER will raise the time to
+  the provided power of 10, useful for converting to micro- or nanoseconds.
+  POWER defaults to 0 if not specified but may be specified any from 0 to 9
 * $time_iso8601 - current local time in ISO 8601 format,
   e.g. "1970-01-01T00:00:00+00:00"
 * $time_local - current local time in Apache log format,
@@ -87,39 +89,51 @@ that receives a "<<" method:
 * $ip - X-Forwarded-For request header if available, $remote_addr if not
 * $pid - process ID of the current process
 * $e{Thread.current} - Thread processing the request
-* $e{Actor.current} - Actor processing the request (Revactor or Rubinius)
+* $e{Fiber.current} - Fiber processing the request
 * $env{variable_name} - any Rack environment variable (e.g. rack.url_scheme)
 
 == REQUIREMENTS
 
-* {Ruby}[http://www.ruby-lang.org/], {Rack}[http://rack.github.io/]
+* {Ruby}[https://www.ruby-lang.org/], {Rack}[https://rack.github.io/]
 
 == DEVELOPMENT
 
 The latest development happens in git and is published to the following:
 
-   git://bogomips.org/clogger.git
-   git://repo.or.cz/clogger.git
+   git clone https://yhbt.net/clogger.git
+   git clone git://repo.or.cz/clogger.git
 
 You may also browse and download snapshot tarballs:
 
-* http://bogomips.org/clogger.git (cgit)
+* https://yhbt.net/clogger.git
 * http://repo.or.cz/w/clogger.git (gitweb)
 
-The mailing list (see below) is central for coordination and
-development.  Patches should always be sent inline
-(git format-patch -M + git send-email) so we can reply to them inline.
+We use email for coordination and development, see below:
 
 == CONTACT
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the public mailing list.
+requests) is done via publicly-archived email:
 
-* mailto:clogger-public@bogomips.org
+* https://yhbt.net/clogger-public/
+* imaps://news.public-inbox.org/inbox.comp.lang.ruby.clogger.0
+* nntps://news.public-inbox.org/inbox.comp.lang.ruby.clogger
 
-Do not send HTML mail or attachments.  Do not top post.
+Tor users may also access HTTP, IMAP, and NNTP archives via .onion:
 
-Homepage: http://clogger.bogomips.org/
+* http://ou63pmih66umazou.onion/clogger-public/
+* imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.clogger.0
+* nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.clogger
+
+AUTH=ANONYMOUS is supported for IMAP and IMAPS, and any
+username + password will work.
+
+No subscription or real names will ever be required to email us.
+Do not send HTML email, do not top post.
+
+* mailto:clogger-public@yhbt.net
+
+Homepage: https://yhbt.net/clogger/
 
 == INSTALL
 

data/clogger.gemspec

@@ -1,25 +1,23 @@
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'olddoc'
-extend Olddoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{clogger}
-  s.version = ENV["VERSION"].dup
-  s.homepage = Olddoc.config['rdoc_url']
+  s.version = (ENV['VERSION'] || '2.1.0').dup
+  s.homepage = 'https://yhbt.net/clogger/'
   s.authors = ["cloggers"]
-  s.description = readme_description
-  s.email = %q{clogger@bogomips.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.summary = 'configurable request logging for Rack'
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{clogger-public@yhbt.net}
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.summary = summary
   s.test_files = %w(test/test_clogger.rb test/test_clogger_to_path.rb)
 
   # HeaderHash wasn't case-insensitive in old versions
-  s.add_dependency(%q<rack>, ["~> 1.0"])
-  s.add_development_dependency(%q<olddoc>, "~> 1.0")
+  s.add_dependency(%q<rack>, ['>= 1.0', '< 3.0'])
+  s.add_development_dependency('test-unit', '~> 3.0')
   s.extensions = %w(ext/clogger_ext/extconf.rb)
-
   s.licenses = %w(LGPL-2.1+)
 end

data/ext/clogger_ext/blocking_helpers.h

@@ -54,6 +54,9 @@ static ssize_t my_write(int fd, const void *buf, size_t count)
 
 	return r;
 }
-#  define stat(path,buf) my_stat((path),(buf))
-#  define write(fd,buf,count) my_write((fd),(buf),(count))
+#  define nogvl_stat(path,buf) my_stat((path),(buf))
+#  define nogvl_write(fd,buf,count) my_write((fd),(buf),(count))
+#else /* !WITHOUT_GVL, for Ruby 1.8 users: */
+#  define nogvl_stat(path,buf) stat((path),(buf))
+#  define nogvl_write(fd,buf,buf) write((fd),(buf),(count))
 #endif /* !WITHOUT_GVL */

data/ext/clogger_ext/clogger.c

@@ -1,3 +1,6 @@
+/* quiet deprecation for _BSD_SOURCE and _SVID_SOURCE: */
+#define _DEFAULT_SOURCE 1
+
 #include <ruby.h>
 #ifdef HAVE_RUBY_IO_H
 #  include <ruby/io.h>
@@ -29,6 +32,7 @@
  * under.
  */
 static clockid_t hopefully_CLOCK_MONOTONIC;
+static VALUE mark_ary;
 
 static void check_clock(void)
 {
@@ -243,7 +247,7 @@ static void write_full(int fd, const char *buf, size_t count)
 	ssize_t r;
 
 	while (count > 0) {
-		r = write(fd, buf, count);
+		r = nogvl_write(fd, buf, count);
 
 		if ((size_t)r == count) { /* overwhelmingly likely */
 			return;
@@ -373,12 +377,40 @@ static void append_ts(struct clogger *c, VALUE op, struct timespec *ts)
 	rb_str_buf_cat(c->log_buf, buf, nr);
 }
 
+#define NANO_PER_SEC (1000 * 1000 * 1000)
 static void append_request_time_fmt(struct clogger *c, VALUE op)
 {
 	struct timespec now;
+	unsigned long ipow = NUM2ULONG(rb_ary_entry(op, 3));
 
 	clock_gettime(hopefully_CLOCK_MONOTONIC, &now);
 	clock_diff(&now, &c->ts_start);
+	if (ipow) {
+		struct timespec prev;
+		unsigned long adj = 1;
+		/*
+		  * n.b. timespec.tv_sec may not be time_t on some platforms,
+		  * so we use a full timespec struct instead of time_t:
+		  */
+		prev.tv_sec = now.tv_sec;
+		do { adj *= 10; } while (--ipow);
+		now.tv_sec *= adj;
+		now.tv_nsec *= adj;
+		if (now.tv_nsec >= NANO_PER_SEC) {
+			int64_t add = now.tv_nsec / NANO_PER_SEC;
+			now.tv_sec += add;
+			now.tv_nsec %= NANO_PER_SEC;
+		}
+		if (now.tv_sec < prev.tv_sec) { /* overflowed */
+			now.tv_nsec = NANO_PER_SEC - 1;
+			/*
+			  * some platforms may use unsigned .tv_sec, but
+			  * they're not worth supporting, so keep unsigned:
+			  */
+			now.tv_sec = (time_t)(sizeof(now.tv_sec) == 4 ?
+			             INT_MAX : LONG_MAX);
+		}
+	}
 	append_ts(c, op, &now);
 }
 
@@ -682,6 +714,7 @@ static VALUE cwrite(struct clogger *c)
 
 	if (c->fd >= 0) {
 		write_full(c->fd, RSTRING_PTR(dst), RSTRING_LEN(dst));
+		/* no need for RB_GC_GUARD(dst) here, marked as c->log_buf */
 	} else {
 		VALUE logger = c->logger;
 
@@ -948,7 +981,7 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
 
 #define CONST_GLOBAL_STR2(var, val) do { \
 	g_##var = rb_obj_freeze(rb_str_new(val, sizeof(val) - 1)); \
-	rb_global_variable(&g_##var); \
+	rb_ary_push(mark_ary, g_##var); \
 } while (0)
 
 #define CONST_GLOBAL_STR(val) CONST_GLOBAL_STR2(val, #val)
@@ -961,14 +994,23 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
  * used to delegate +:to_path+ checks for Rack webservers that optimize
  * static file serving
  */
-static VALUE respond_to(VALUE self, VALUE method)
+static VALUE respond_to(int argc, VALUE *argv, VALUE self)
 {
 	struct clogger *c = clogger_get(self);
-	ID id = rb_to_id(method);
+	VALUE method, include_all;
+	ID id;
 
+	rb_scan_args(argc, argv, "11", &method, &include_all);
+	id = rb_to_id(method);
 	if (close_id == id)
 		return Qtrue;
-	return rb_respond_to(c->body, id);
+
+#ifdef HAVE_RB_OBJ_RESPOND_TO
+	return rb_obj_respond_to(c->body, id, RTEST(include_all));
+#endif
+	if (argc == 1)
+		return rb_respond_to(c->body, id);
+	return rb_funcallv(c->body, respond_to_id, argc, argv);
 }
 
 /*
@@ -993,7 +1035,7 @@ static VALUE to_path(VALUE self)
 	if (sscanf(cpath, "/dev/fd/%u", &devfd) == 1)
 		rv = fstat((int)devfd, &sb);
 	else
-		rv = stat(cpath, &sb);
+		rv = nogvl_stat(cpath, &sb);
 
 	/*
 	 * calling this method implies the web server will bypass
@@ -1014,6 +1056,9 @@ void Init_clogger_ext(void)
 {
 	VALUE tmp;
 
+	mark_ary = rb_ary_new();
+	rb_global_variable(&mark_ary);
+
 	check_clock();
 
 	write_id = rb_intern("write");
@@ -1039,7 +1084,7 @@ void Init_clogger_ext(void)
 	rb_define_method(cClogger, "wrap_body?", clogger_wrap_body, 0);
 	rb_define_method(cClogger, "reentrant?", clogger_reentrant, 0);
 	rb_define_method(cClogger, "to_path", to_path, 0);
-	rb_define_method(cClogger, "respond_to?", respond_to, 1);
+	rb_define_method(cClogger, "respond_to?", respond_to, -1);
 	rb_define_method(cClogger, "body", body, 0);
 	CONST_GLOBAL_STR(REMOTE_ADDR);
 	CONST_GLOBAL_STR(HTTP_X_FORWARDED_FOR);
@@ -1059,4 +1104,6 @@ void Init_clogger_ext(void)
 	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"));
+
+	rb_obj_freeze(mark_ary);
 }

data/ext/clogger_ext/extconf.rb

@@ -22,6 +22,7 @@ begin
   have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
   have_func('rb_thread_blocking_region', 'ruby.h')
   have_func('rb_thread_io_blocking_region', 'ruby.h')
+  have_func('rb_obj_respond_to', 'ruby/intern.h')
   create_makefile('clogger_ext')
 rescue Object => err
   warn "E: #{err.inspect}"

data/lib/clogger.rb

@@ -51,7 +51,7 @@ private
 
   SCAN = /([^$]*)(\$+(?:env\{\w+(?:\.[\w\.]+)?\}|
                         e\{[^\}]+\}|
-                        (?:request_)?time\{\d+\}|
+                        (?:request_)?time\{\d+(?:,\d+)?\}|
                         time_(?:utc|local)\{[^\}]+\}|
                         \w*))?([^$]*)/x
 
@@ -92,7 +92,14 @@ private
         when /\A\$time\{(\d+)\}\z/
           rv << [ OP_TIME, *usec_conv_pair(tok, $1.to_i) ]
         when /\A\$request_time\{(\d+)\}\z/
-          rv << [ OP_REQUEST_TIME, *usec_conv_pair(tok, $1.to_i) ]
+          rv << [ OP_REQUEST_TIME, *usec_conv_pair(tok, $1.to_i), 0 ]
+        when /\A\$request_time\{(\d+),(\d+)\}\z/
+          ipow = $1.to_i
+          prec = $2.to_i
+          if ipow > 9 # nanosecond precision is the highest POSIX goes
+            raise ArgumentError, "#{tok}: too big: #{ipow} (max=9)"
+          end
+          rv << [ OP_REQUEST_TIME, *usec_conv_pair(tok, prec), ipow ]
         else
           tok_sym = tok[1..-1].to_sym
           if special_code = SPECIAL_VARS[tok_sym]

data/lib/clogger/format.rb

@@ -5,12 +5,12 @@ class Clogger
   # predefined log formats in wide use
   module Format
     # common log format used by Apache:
-    # http://httpd.apache.org/docs/2.2/logs.html
+    # https://httpd.apache.org/docs/2.4/logs.html
     Common = "$remote_addr - $remote_user [$time_local] " \
              '"$request" $status $response_length'
 
     # combined log format used by Apache:
-    # http://httpd.apache.org/docs/2.2/logs.html
+    # https://httpd.apache.org/docs/2.4/logs.html
     Combined = %Q|#{Common} "$http_referer" "$http_user_agent"|
 
     # combined log format used by nginx:

data/lib/clogger/pure.rb

@@ -6,7 +6,7 @@
 class Clogger
 
   attr_accessor :env, :status, :headers, :body
-  attr_writer :body_bytes_sent
+  attr_writer :body_bytes_sent, :start
 
   def initialize(app, opts = {})
     # trigger autoload to avoid thread-safety issues later on
@@ -28,10 +28,10 @@ class Clogger
   end
 
   def call(env)
-    @start = Time.now
+    start = mono_now
     resp = @app.call(env)
     unless resp.instance_of?(Array) && resp.size == 3
-      log(env, 500, {})
+      log(env, 500, {}, start)
       raise TypeError, "app response not a 3 element Array: #{resp.inspect}"
     end
     status, headers, body = resp
@@ -39,20 +39,21 @@ class Clogger
     if @wrap_body
       @reentrant = env['rack.multithread'] if @reentrant.nil?
       wbody = @reentrant ? self.dup : self
+      wbody.start = start
       wbody.env = env
       wbody.status = status
       wbody.headers = headers
       wbody.body = body
       return [ status, headers, wbody ]
     end
-    log(env, status, headers)
+    log(env, status, headers, start)
     [ status, headers, body ]
   end
 
   def each
     @body_bytes_sent = 0
     @body.each do |part|
-      @body_bytes_sent += Rack::Utils.bytesize(part)
+      @body_bytes_sent += part.bytesize
       yield part
     end
     self
@@ -60,8 +61,8 @@ class Clogger
 
   def close
     @body.close if @body.respond_to?(:close)
-    ensure
-      log(@env, @status, @headers)
+  ensure
+    log(@env, @status, @headers)
   end
 
   def reentrant?
@@ -76,8 +77,8 @@ class Clogger
     @logger.respond_to?(:fileno) ? @logger.fileno : nil
   end
 
-  def respond_to?(m)
-    :close == m.to_sym || @body.respond_to?(m)
+  def respond_to?(method, include_all=false)
+    :close == method.to_sym || @body.respond_to?(method, include_all)
   end
 
   def to_path
@@ -153,7 +154,7 @@ private
     format % [ sec, usec / div ]
   end
 
-  def log(env, status, headers)
+  def log(env, status, headers, start = @start)
     str = @fmt_ops.map { |op|
       case op[0]
       when OP_LITERAL; op[1]
@@ -164,7 +165,8 @@ private
       when OP_TIME_LOCAL; Time.now.strftime(op[1])
       when OP_TIME_UTC; Time.now.utc.strftime(op[1])
       when OP_REQUEST_TIME
-        t = Time.now - @start
+        t = mono_now - start
+        t = t * (10 ** op[3])
         time_format(t.to_i, (t - t.to_i) * 1000000, op[1], op[2])
       when OP_TIME
         t = Time.now
@@ -184,4 +186,14 @@ private
     end
     nil
   end
+
+  # favor monotonic clock if possible, and try to use clock_gettime in
+  # more recent Rubies since it generates less garbage
+  if defined?(Process::CLOCK_MONOTONIC)
+    def mono_now; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
+  elsif defined?(Process::CLOCK_REALTIME)
+    def mono_now; Process.clock_gettime(Process::CLOCK_REALTIME); end
+  else
+    def mono_now; Time.now.to_f; end
+  end
 end

data/pkg.mk

@@ -60,7 +60,7 @@ doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(RDOC) -f oldweb
+	$(RDOC) -f dark216
 	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
 	install -m644 NEWS doc/NEWS

data/test/test_clogger.rb

@@ -147,6 +147,7 @@ class TestClogger < Test::Unit::TestCase
     req = {
       'HTTP_HOST' => 'example.com:12345',
       'HTTP_COOKIE' => cookie,
+      'REMOTE_USER' => 'foo_user',
     }
     req = @req.merge(req)
     body = cl.call(req).last
@@ -154,6 +155,7 @@ class TestClogger < Test::Unit::TestCase
     body.close
     str = str.string
     assert(str.size > 128)
+    assert_equal 'foo_user', str.split(' ')[2]
     assert_match %r["echo and socat \\o/" "#{cookie}" \d+\.\d{3}], str
     assert_match %r["#{cookie}" \d+\.\d{3} example\.com:12345\n\z], str
   end
@@ -165,10 +167,11 @@ class TestClogger < Test::Unit::TestCase
       ary = compile_format(
         '$remote_addr - $remote_user [$time_local] ' \
         '"$request" $status $body_bytes_sent "$http_referer" ' \
-        '"$http_user_agent" "$http_cookie" $request_time ' \
+        '"$http_user_agent" "$http_cookie" $request_time $request_time{6,0} ' \
         '$env{rack.url_scheme}' \
         "\n")
     }
+
     expect = [
       [ Clogger::OP_REQUEST, "REMOTE_ADDR" ],
       [ Clogger::OP_LITERAL, " - " ],
@@ -188,7 +191,9 @@ class TestClogger < Test::Unit::TestCase
       [ Clogger::OP_LITERAL, "\" \"" ],
       [ Clogger::OP_REQUEST, "HTTP_COOKIE" ],
       [ Clogger::OP_LITERAL, "\" " ],
-      [ Clogger::OP_REQUEST_TIME, '%d.%03d', 1000 ],
+      [ Clogger::OP_REQUEST_TIME, '%d.%03d', 1000, 0],
+      [ Clogger::OP_LITERAL, " " ],
+      [ Clogger::OP_REQUEST_TIME, '%d', 1, 6],
       [ Clogger::OP_LITERAL, " " ],
       [ Clogger::OP_REQUEST, "rack.url_scheme" ],
       [ Clogger::OP_LITERAL, "\n" ],
@@ -207,6 +212,22 @@ class TestClogger < Test::Unit::TestCase
     assert_equal "-#{current}-\n", str.string
   end
 
+  def test_fiber
+    begin
+      current = Fiber.current.to_s
+    rescue NameError => e
+      warn "your Ruby does not support fibers #{e}"
+      return
+    end
+    str = StringIO.new
+    app = lambda { |env| [ 302, {}, [] ] }
+    cl = Clogger.new(app,
+                    :logger => str,
+                    :format => "-$e{Fiber.current}-\n")
+    status, headers, body = cl.call(@req)
+    assert_equal "-#{current}-\n", str.string
+  end
+
   def test_pid
     str = StringIO.new
     app = lambda { |env| [ 302, {}, [] ] }
@@ -719,6 +740,24 @@ class TestClogger < Test::Unit::TestCase
     assert s[-1].to_f <= 0.110
   end
 
+  def test_request_time_with_multiplier
+    s = []
+    app = lambda { |env| sleep(0.1) ; [302, [], [] ] }
+    cl = Clogger.new(app, :logger => s, :format => "$request_time{9,0}")
+    status, headers, body = cl.call(@req)
+    assert_nothing_raised { body.each { |x| } ; body.close }
+    assert s[-1].to_f >= 100000000
+    assert s[-1].to_f <= 300000000
+  end
+
+  def test_request_time_with_invalid_multiplier
+    s = []
+    app = lambda { |env| sleep(0.1) ; [302, [], [] ] }
+    assert_raise(ArgumentError) {
+      cl = Clogger.new(app, :logger => s, :format => "$request_time{10,0}")
+    }
+  end
+
   def test_insanely_long_time_format
     s = []
     app = lambda { |env| [200, [], [] ] }

data/test/test_clogger_to_path.rb

@@ -14,6 +14,10 @@ class MyBody < Struct.new(:to_path, :closed)
   def close
     self.closed = true
   end
+
+private
+  def privtest
+  end
 end
 
 class TestCloggerToPath < Test::Unit::TestCase
@@ -59,6 +63,11 @@ class TestCloggerToPath < Test::Unit::TestCase
     status, headers, body = app.call(@req)
     assert_instance_of(Clogger, body)
     check_body(body)
+
+    assert ! body.respond_to?(:privtest)
+    assert body.respond_to?(:privtest, true)
+    assert ! body.respond_to?(:privtest, false)
+
     assert logger.string.empty?
     assert_equal tmp.path, body.to_path
     body.close

metadata

@@ -1,56 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: clogger
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.3.0
 platform: ruby
 authors:
 - cloggers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: olddoc
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 description: |-
   clogger is Rack middleware for logging HTTP requests.  The log format
   is customizable so you can specify exactly which fields to log.
-email: clogger@bogomips.org
+email: clogger-public@yhbt.net
 executables: []
 extensions:
 - ext/clogger_ext/extconf.rb
 extra_rdoc_files:
 - README
 - NEWS
-- lib/clogger.rb
-- lib/clogger/format.rb
-- lib/clogger/pure.rb
 - ext/clogger_ext/clogger.c
 - LICENSE
 files:
@@ -68,7 +71,6 @@ files:
 - README
 - Rakefile
 - archive/.gitignore
-- archive/rfmig.rb
 - archive/slrnpull.conf
 - clogger.gemspec
 - ext/clogger_ext/blocking_helpers.h
@@ -83,7 +85,7 @@ files:
 - setup.rb
 - test/test_clogger.rb
 - test/test_clogger_to_path.rb
-homepage: http://clogger.bogomips.org/
+homepage: https://yhbt.net/clogger/
 licenses:
 - LGPL-2.1+
 metadata: {}
@@ -102,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: configurable request logging for Rack

data/archive/rfmig.rb

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-require 'find'
-require 'fileutils'
-rfdir = 'rubyforge.org:/var/www/gforge-projects/clogger/'
-newbase = 'http://clogger.bogomips.org/'
-refresh = '<meta http-equiv="refresh" content="0; url=%s" />'
-old = 'rf.old'
-new = 'rf.new'
-cmd = %W(rsync -av #{rfdir} #{old}/)
-unless File.directory?(old)
-  system(*cmd) or abort "#{cmd.inspect} failed: #$?"
-end
-
-Find.find(old) do |path|
-  path =~ /\.html\z/ or next
-  data = File.read(path)
-  tmp = path.split(%r{/})
-  tmp.shift == old or abort "BUG"
-  dst = "#{new}/#{tmp.join('/')}"
-
-  tmp[-1] = '' if tmp[-1] == "index.html"
-  url = "#{newbase}#{tmp.join('/')}"
-  meta = sprintf(refresh, url)
-  data.sub!(/(<head[^>]*>)/i, "#$1#{meta}")
-  data.sub!(/(<body[^>]*>)/i,
-            "#{$1}Redirecting to <a href=\"#{url}\">#{url}</a> ...<br/>")
-  FileUtils.mkdir_p(File.dirname(dst))
-  File.open(dst, "w") { |fp| fp.write(data) }
-end
-
-print "Verify results in #{new}/, then run:\n  "
-puts %W(rsync -av #{new}/ #{rfdir}).join(' ')