raindrops 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0632eff3853589bfe99f749a3db3d12fa991220a
-  data.tar.gz: 19c74eeede4492633f1e3b189b24e4a085fbe40f
+  metadata.gz: b07afc95a2e2b6d5f116be36ceab5bfe45b58bef
+  data.tar.gz: 5c8e436802a87b95de68fda59b5e0947d58a4ad5
 SHA512:
-  metadata.gz: a818ad3da0618365d832b5979de131a6fbafe3737877e4a4e95891b993ae6f0c90fd8938cb60494c95cd8ffaf67dd75a017549878f46739442f2739512f3b272
-  data.tar.gz: 00b463e110ee126cfbda005af3b6f20c084120428aea74982795b1102dcab9487b461b35834cf3a71885c7d11fea29a3a1596d7f010e93e5210b376c5f6cad96
+  metadata.gz: fd1415d86ff4e2a641eec851906498b551318d0a66cdc52d8cfafe5d46826ede496c0e44b9b6a768ea95db0537f03b5387ce4fda09a8e97af2a8f9ab7ce741d0
+  data.tar.gz: f0960929656a511b43df2340bf07cbd072cd2fabbe8858c35112450bc790c6cfa406114329b93dd954a6d7c9e6f3ebee75a703bd6cf29f8198b0342fb9c292fd

data/.olddoc.yml

@@ -1,9 +1,15 @@
 ---
-cgit_url: http://bogomips.org/raindrops.git
+cgit_url: https://bogomips.org/raindrops.git
 git_url: git://bogomips.org/raindrops.git
-rdoc_url: http://raindrops.bogomips.org/
+rdoc_url: https://bogomips.org/raindrops/
 public_email: raindrops-public@bogomips.org
 private_email: raindrops@bogomips.org
-ml_url: http://bogomips.org/raindrops-public/
+ml_url:
+- https://bogomips.org/raindrops-public/
+- http://ou63pmih66umazou.onion/raindrops-public
 nntp_url:
-  - nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+- nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.raindrops
+source_code:
+- git clone git://bogomips.org/raindrops.git
+- git clone https://bogomips.org/raindrops.git

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,4 +1,4 @@
 all::
-RSYNC_DEST := bogomips.org:/srv/raindrops
+RSYNC_DEST := bogomips.org:/srv/bogomips/raindrops
 rfpackage := raindrops
 include pkg.mk

data/LICENSE

@@ -3,8 +3,8 @@ 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
-later.  Currently version {3}[http://www.gnu.org/licenses/lgpl-3.0.txt],
+Foundation, version {2.1}[https://www.gnu.org/licenses/lgpl-2.1.txt] or
+later.  Currently version {3}[https://www.gnu.org/licenses/lgpl-3.0.txt],
 is preferred (see link:COPYING).
 
 raindrops is distributed in the hope that it will be useful, but WITHOUT
@@ -13,4 +13,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 the raindrops; if not, see <http://www.gnu.org/licenses/>
+along with the raindrops; if not, see <https://www.gnu.org/licenses/>

data/README

@@ -40,7 +40,7 @@ and "tcp_diag" kernel modules are loaded as they do not autoload correctly
 We recommend GCC 4+ (or compatible) to support the __sync builtins
 (__sync_{add,sub}_and_fetch()):
 
-http://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
+https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
 
 For non-GCC 4+ users, we also support compilation with the libatomic_ops
 package starting with Raindrops 0.4.0:
@@ -54,12 +54,6 @@ If you use RubyGems:
 
     gem install raindrops
 
-Otherwise grab the latest tarball from:
-
-http://raindrops.bogomips.org/files/
-
-Unpack it, and run "ruby setup.rb"
-
 == Usage
 
 See Raindrops::Middleware and Raindrops::LastDataRecv documentation for
@@ -77,7 +71,7 @@ You can get the latest source via git from the following locations:
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://bogomips.org/raindrops.git
+* https://bogomips.org/raindrops.git
 * http://repo.or.cz/w/raindrops.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
@@ -96,7 +90,7 @@ raindrops is licensed under the LGPL-2.1+
 All feedback (bug reports, user/development discussion, patches, pull
 requests) go to the mailing list: mailto:raindrops-public@bogomips.org
 
-Mailing list archives are available over HTTP and NNTP:
+Mailing list archives are available over HTTPS and NNTP:
 
-http://bogomips.org/raindrops-public/
-nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+* https://bogomips.org/raindrops-public/
+* nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops

data/examples/watcher_demo.ru

@@ -1,5 +1,5 @@
 # This is a snippet of the config that powers
-# http://raindrops-demo.bogomips.org/
+# https://raindrops-demo.bogomips.org/
 # This may be used with the packaged zbatery.conf.rb
 #
 # zbatery -c zbatery.conf.ru watcher_demo.ru -E none

data/examples/yahns.conf.rb

@@ -0,0 +1,30 @@
+# Inlined rack app using yahns server (git clone git://yhbt.net/yahns.git)
+# Usage: yahns -c /path/to/this/file.conf.rb
+# There is no separate config.ru file for this example,
+# but rack_app may also be a string pointing to the path of a
+# config.ru file
+
+require 'rack'
+rack_app = Rack::Builder.new do
+  use Rack::Head
+  addr = %w(0.0.0.0:9418 0.0.0.0:443 [::]:443 0.0.0.0:80 [::]:80
+	    127.0.0.1:6081 127.0.0.1:280 0.0.0.0:119 [::]:119)
+  use Raindrops::Middleware, listeners: addr
+  run Raindrops::Watcher.new(listeners: addr)
+end.to_app
+# rack_app = '/path/to/config.ru' # a more standard config
+
+app(:rack, rack_app) do
+  # I keep IPv4 and IPv6 on separate sockets to avoid ugly
+  # IPv4-mapped-IPv6 addresses:
+  listen 8080
+  listen '[::]:8080', ipv6only: true
+  client_max_body_size 0 # no POST or any uploads
+  client_timeout 5
+  output_buffering false # needed for /tail/ endpoint to avoid ENOSPC
+  queue { worker_threads 30 }
+end
+
+# logging is optional, but recommended for diagnosing problems
+# stderr_path '/var/log/yahns/stderr-raindrops.log'
+# stdout_path '/var/log/yahns/stdout-raindrops.log'

data/examples/zbatery.conf.rb

@@ -1,6 +1,9 @@
 # Used for running Raindrops::Watcher, which requires a multi-threaded
 # Rack server capable of streaming a response.  Threads must be used,
-# so Zbatery is recommended: http://zbatery.bogomip.org/
+# so any multi-threaded Rack server may be used.
+# zbatery was recommended in the past, but it is abandoned
+# <http://zbatery.bogomip.org/>.
+# yahns may work as an alternative (see yahns.conf.rb in this dir)
 Rainbows! do
   use :ThreadSpawn
 end

data/ext/raindrops/linux_inet_diag.c

@@ -214,6 +214,10 @@ static const char *addr_any(sa_family_t family)
 	return ipv6;
 }
 
+#ifdef __GNUC__
+static void bug_warn_nogvl(const char *, ...)
+	__attribute__((format(printf,1,2)));
+#endif
 static void bug_warn_nogvl(const char *fmt, ...)
 {
 	va_list ap;

data/ext/raindrops/linux_tcp_info.c

@@ -126,7 +126,7 @@ void Init_raindrops_linux_tcp_info(void)
 	 * - rcv_space
 	 * - total_retrans
 	 *
-	 * http://kernel.org/doc/man-pages/online/pages/man7/tcp.7.html
+	 * https://kernel.org/doc/man-pages/online/pages/man7/tcp.7.html
 	 */
 	cTCP_Info = rb_define_class_under(cRaindrops, "TCP_Info", rb_cObject);
 	rb_define_alloc_func(cTCP_Info, alloc);

data/lib/raindrops/aggregate.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 #
-# raindrops may use the {aggregate}[http://github.com/josephruscio/aggregate]
+# raindrops may use the {aggregate}[https://github.com/josephruscio/aggregate]
 # RubyGem to aggregate statistics from TCP_Info lookups.
 module Raindrops::Aggregate
   autoload :PMQ, "raindrops/aggregate/pmq"

data/lib/raindrops/middleware.rb

@@ -62,9 +62,9 @@
 # = Demo Server
 #
 # There is a server running this middleware (and Watcher) at
-#  http://raindrops-demo.bogomips.org/_raindrops
+#  https://raindrops-demo.bogomips.org/_raindrops
 #
-# Also check out the Watcher demo at http://raindrops-demo.bogomips.org/
+# Also check out the Watcher demo at https://raindrops-demo.bogomips.org/
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.

data/lib/raindrops/watcher.rb

@@ -8,7 +8,7 @@
 # Raindrops::Watcher is a stand-alone Rack application for watching
 # any number of TCP and UNIX listeners (all of them by default).
 #
-# It depends on the {Aggregate RubyGem}[http://rubygems.org/gems/aggregate]
+# It depends on the {Aggregate RubyGem}[https://rubygems.org/gems/aggregate]
 #
 # In your Rack config.ru:
 #
@@ -35,28 +35,28 @@
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.txt
+# e.g.: curl https://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.txt
 #
 # === GET /active/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.html
+# e.g.: curl https://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.html
 #
 # === GET /queued/$LISTENER.txt
 #
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.txt
+# e.g.: curl https://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.txt
 #
 # === GET /queued/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
+# e.g.: curl https://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
 #
 # === POST /reset/$LISTENER
 #
@@ -95,9 +95,9 @@
 #
 # = Demo Server
 #
-# There is a server running this app at http://raindrops-demo.bogomips.org/
+# There is a server running this app at https://raindrops-demo.bogomips.org/
 # The Raindrops::Middleware demo is also accessible at
-# http://raindrops-demo.bogomips.org/_raindrops
+# https://raindrops-demo.bogomips.org/_raindrops
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.
@@ -106,7 +106,7 @@ class Raindrops::Watcher
   attr_reader :snapshot
   include Rack::Utils
   include Raindrops::Linux
-  DOC_URL = "http://raindrops.bogomips.org/Raindrops/Watcher.html"
+  DOC_URL = "https://bogomips.org/raindrops/Raindrops/Watcher.html"
   Peak = Struct.new(:first, :last)
 
   def initialize(opts = {})
@@ -244,10 +244,10 @@ def agg_to_hash(reset_at, agg, current, peak)
   def histogram_txt(agg)
     updated_at, reset_at, agg, current, peak = *agg
     headers = agg_to_hash(reset_at, agg, current, peak)
-    body = agg.to_s
+    body = agg.to_s # 7-bit ASCII-clean
     headers["Content-Type"] = "text/plain"
     headers["Expires"] = (updated_at + @delay).httpdate
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -265,7 +265,7 @@ def histogram_html(agg, addr)
       "</body>"
     headers["Content-Type"] = "text/html"
     headers["Expires"] = (updated_at + @delay).httpdate
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -364,7 +364,7 @@ def index
         "for more information and options." \
       "</p>" \
       "</body></html>"
-    headers["Content-Length"] = bytesize(body).to_s
+    headers["Content-Length"] = body.size.to_s
     [ 200, headers, [ body ] ]
   end
 
@@ -382,7 +382,7 @@ def initialize(rdmon, addr, env) # :nodoc:
       q = Rack::Utils.parse_query env["QUERY_STRING"]
       @active_min = q["active_min"].to_i
       @queued_min = q["queued_min"].to_i
-      len = Rack::Utils.bytesize(addr)
+      len = addr.size
       len = 35 if len > 35
       @fmt = "%20s % #{len}s % 10u % 10u\n"
       case env["HTTP_VERSION"]

data/raindrops.gemspec

@@ -23,7 +23,7 @@
   s.add_development_dependency('test-unit', '~> 3.0')
   s.add_development_dependency('io-extra', [ '~> 1.2', '>= 1.2.3'])
   s.add_development_dependency('posix_mq', '~> 2.0')
-  s.add_development_dependency('rack', '~> 1.2')
+  s.add_development_dependency('rack', [ '>= 1.2', '< 3.0' ])
   s.add_development_dependency('olddoc', '~> 1.0')
 
   s.licenses = %w(LGPL-2.1+)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aggregate
@@ -76,16 +76,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: olddoc
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +154,7 @@ files:
 - examples/middleware.ru
 - examples/watcher.ru
 - examples/watcher_demo.ru
+- examples/yahns.conf.rb
 - examples/zbatery.conf.rb
 - ext/raindrops/extconf.rb
 - ext/raindrops/linux_inet_diag.c
@@ -186,7 +193,7 @@ files:
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
 - test/test_watcher.rb
-homepage: http://raindrops.bogomips.org/
+homepage: https://bogomips.org/raindrops/
 licenses:
 - LGPL-2.1+
 metadata: {}
@@ -206,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: real-time stats for preforking Rack servers