raindrops 0.4.1 → 0.5.0

data/.document

@@ -3,5 +3,6 @@ LICENSE
 NEWS
 ChangeLog
 lib
-ext/raindrops/raindrops_ext.c
+ext/raindrops/raindrops.c
 ext/raindrops/linux_inet_diag.c
+ext/raindrops/linux_tcp_info.c

data/.gitignore

@@ -11,3 +11,7 @@ Makefile
 /man
 /pkg
 /doc
+/LATEST
+/tmp
+# http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
+/Gemfile.lock

data/.wrongdoc.yml

@@ -0,0 +1,4 @@
+---
+cgit_url: http://bogomips.org/raindrops.git
+git_url: git://bogomips.org/raindrops.git
+rdoc_url: http://raindrops.bogomips.org/

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,199 +1,5 @@
-# use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
-GIT_URL = git://git.bogomips.org/raindrops.git
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
-endif
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-endif
-
-install: $(bins)
-	$(prep_setup_rb)
-	$(RM) -r .install-tmp
-	mkdir .install-tmp
-	cp -p bin/* .install-tmp
-	$(RUBY) setup.rb all
-	$(RM) $^
-	mv .install-tmp/* bin/
-	$(RM) -r .install-tmp
-	$(prep_setup_rb)
-
-setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean
-
-clean:
-	-$(MAKE) -C ext/raindrops clean
-	$(RM) $(setup_rb_files) ext/raindrops/Makefile
-
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog
-manifest: $(pkg_extra)
-	$(RM) .manifest
-	$(MAKE) .manifest
-
-.manifest:
-	(git ls-files && \
-         for i in $@ $(pkg_extra) $(man1_paths); \
-	 do echo $$i; done) | LC_ALL=C sort > $@+
-	cmp $@+ $@ || mv $@+ $@
-	$(RM) $@+
-
-NEWS: GIT-VERSION-FILE
-	$(RAKE) -s news_rdoc > $@+
-	mv $@+ $@
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' $<
-
-SINCE = 0.2.0
-ChangeLog: LOG_VERSION = \
-  $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
-          echo $(GIT_VERSION) || git describe)
-ifneq ($(SINCE),)
-ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION)
-endif
-ChangeLog: GIT-VERSION-FILE
-	@echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+
-	@echo >> $@+
-	git log $(log_range) | sed -e 's/^/    /' >> $@+
-	mv $@+ $@
-
-news_atom := http://raindrops.bogomips.org/NEWS.atom.xml
-cgit_atom := http://git.bogomips.org/cgit/raindrops.git/atom/?h=master
-atom = <link rel="alternate" title="Atom feed" href="$(1)" \
-             type="application/atom+xml"/>
-
-# using rdoc 2.5.x
-doc: .document NEWS ChangeLog
-	for i in $(man1_bins); do > $$i; done
-	rdoc -a -t "$(shell sed -ne '1s/^= //p' README)"
-	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
-	cd doc && for i in $(base_bins); do \
-	  html=$$(echo $$i | sed 's/\.rb/_rb/')_1.html; \
-	  sed -e '/"documentation">/r man1/'$$i'.1.html' \
-		< $$html > tmp && mv tmp $$html; done
-	$(RUBY) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \
-	  doc/ChangeLog.html
-	$(RUBY) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
-	  doc/NEWS.html doc/README.html
-	$(RAKE) -s news_atom > doc/NEWS.atom.xml
-	cd doc && ln README.html tmp && mv tmp index.html
-	$(RM) $(man1_bins)
-
-ifneq ($(VERSION),)
+RSYNC_DEST := bogomips.org:/srv/raindrops
 rfproject := rainbows
 rfpackage := raindrops
-pkggem := pkg/$(rfpackage)-$(VERSION).gem
-pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	$(RAKE) -s release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(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
-verify:
-	test x"$(shell umask)" = x0022
-	git rev-parse --verify refs/tags/v$(VERSION)^{}
-	git diff-index --quiet HEAD^0
-	test `git rev-parse --verify HEAD^0` = \
-	     `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
-
-$(pkggem): manifest fix-perms
-	gem build $(rfpackage).gemspec
-	mkdir -p pkg
-	mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): manifest fix-perms
-	@test -n "$(distdir)"
-	$(RM) -r $(distdir)
-	mkdir -p $(distdir)
-	tar c `cat .manifest` | (cd $(distdir) && tar x)
-	cd pkg && tar c $(basename $(@F)) | gzip -9 > $(@F)+
-	mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-test-release: verify package $(release_notes) $(release_changes)
-release: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	# push gem to Gemcutter
-	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	-rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-	$(RAKE) publish_news VERSION=$(VERSION)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
-endif
-
-ext := ext/raindrops/raindrops_ext.$(DLEXT)
-ext/raindrops/Makefile: ext/raindrops/extconf.rb
-	cd $(@D) && $(RUBY) extconf.rb
-$(ext): $(wildcard $(addprefix ext/raindrops/,*.c *.h)) ext/raindrops/Makefile
-	$(MAKE) -C $(@D)
-
-all:: test
-
-export STRESS BENCHMARK
-build: $(ext)
-test_units := $(wildcard test/test_*.rb)
-test: test-unit
-test-unit: $(test_units)
-$(test_units): build
-	$(RUBY) -I lib:ext/raindrops $@
-
-# this requires GNU coreutils variants
-publish_doc:
-	-git set-file-times
-	$(RM) -r doc ChangeLog NEWS
-	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-	$(MAKE) -s latest > doc/LATEST
-	find doc/images doc/js -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
-	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
-	$(MAKE) doc_gz
-	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ raindrops.bogomips.org:/srv/raindrops/
-	git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
-doc_gz:
-	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
-	for i in $(docs); do \
-	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
-
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test $(test_units)
+include pkg.mk

data/Gemfile

@@ -0,0 +1,7 @@
+source(ENV["GEM_SOURCE"] || :rubygems)
+gem 'aggregate', '~> 0.2'
+gem 'io-extra', '~> 1.2.3'
+gem 'posix_mq', '~> 1.0'
+gem 'wrongdoc', '~> 1.5'
+gem 'rack', '~> 1.2'
+gem 'unicorn', '>= 0.98'

data/LICENSE

@@ -14,5 +14,5 @@ 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 GNU C Library; if not, write to the Free Software
+along with the raindrops; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301

data/README

@@ -1,13 +1,11 @@
 = raindrops - real-time stats for preforking Rack servers
 
-Raindrops is a real time stats package to show statistics for Rack HTTP
+Raindrops is a real-time stats toolkit to show statistics for Rack HTTP
 servers.  It is designed for preforking servers such as Rainbows! and
 Unicorn, but should support any Rack HTTP server under Ruby 1.9, 1.8 and
-possibly Rubinius (untested) on platforms supporting POSIX shared memory.
-
-Raindrops includes a Struct-like Raindrops::Struct class that may be used
-standalone to create atomic counters shared across any number of forked
-processes under SMP.
+Rubinius on platforms supporting POSIX shared memory.  It may also be
+used as a generic scoreboard for sharing atomic counters across multiple
+processes.
 
 == Features
 
@@ -32,6 +30,12 @@ processes under SMP.
   instead of parsing /proc/net/tcp to minimize overhead.
   This was fun to discover and write.
 
+* TCP_Info reporting may be used to check stat for every accepted client
+  on TCP servers
+
+Users of older Linux kernels need to ensure that the the "inet_diag"
+and "tcp_diag" kernel modules are loaded as they do not autoload correctly
+
 == Install
 
 We recommend GCC 4+ (or compatible) to support the
@@ -54,58 +58,24 @@ http://raindrops.bogomips.org/files/
 
 Unpack it, and run "ruby setup.rb"
 
-== Usage (Rainbows!/Unicorn preload_app=false)
-
-If you're using preload_app=false (the default) in your Rainbows!/Unicorn
-config file, you'll need to create the global Stats object before
-forking.
-
-        require 'raindrops'
-        $stats ||= Raindrops::Middleware::Stats.new
-
-In your Rack config.ru:
-
-        use Raindrops::Middleware, :stats => $stats
-
-== Usage (Rainbows!/Unicorn preload_app=true)
-
-If you're using preload_app=true in your Rainbows!/Unicorn
-config file, just add the middleware to your stack:
-
-In your Rack config.ru:
-
-        use Raindrops::Middleware
-
-== Usage (Linux-extras)
-
-To get bound listener statistics under Linux, you need to specify the
-listener names for your server.  You can even include listen sockets for
-*other* servers on the same machine.  This can be handy for monitoring
-your nginx proxy as well.
-
-In your Rack config.ru, just pass the :listeners argument as an array of
-strings (along with any other arguments).  You can specify any
-combination of TCP or Unix domain socket names:
-
-        use Raindrops::Middleware, :listeners => %w(0.0.0.0:80 /tmp/.sock)
-
-See the tests/ and examples/ directory for more examples.
+== Usage
 
-If you're running Unicorn 0.98.0 or later, you don't have to pass in
-the :listeners array, Raindrops will automatically detect the listeners
-used by Unicorn master process.
+See Raindrops::Middleware and Raindrops::LastDataRecv documentation for
+use Rack servers.  The entire library is fully-documented and we are
+responsive on the mailing list (mailto:raindrops@librelist.com) if you
+have any questions or comments.
 
 == Development
 
 You can get the latest source via git from the following locations:
 
-  git://git.bogomips.org/raindrops.git
+  git://bogomips.org/raindrops.git
   git://repo.or.cz/raindrops.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://git.bogomips.org/cgit/raindrops.git (cgit)
+* http://bogomips.org/raindrops.git (cgit)
 * http://repo.or.cz/w/raindrops.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are

data/Rakefile

@@ -1,107 +1,3 @@
-# -*- encoding: binary -*-
-
-# most tasks are in the GNUmakefile which offers better parallelism
-
-def tags
-  timefmt = '%Y-%m-%dT%H:%M:%SZ'
-  @tags ||= `git tag -l`.split(/\n/).map do |tag|
-    if %r{\Av[\d\.]+\z} =~ tag
-      header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
-      header = header.split(/\n/)
-      tagger = header.grep(/\Atagger /).first
-      body ||= "initial"
-      {
-        :time => Time.at(tagger.split(/ /)[-2].to_i).utc.strftime(timefmt),
-        :tagger_name => %r{^tagger ([^<]+)}.match(tagger)[1].strip,
-        :tagger_email => %r{<([^>]+)>}.match(tagger)[1].strip,
-        :id => `git rev-parse refs/tags/#{tag}`.chomp!,
-        :tag => tag,
-        :subject => subject,
-        :body => body,
-      }
-    end
-  end.compact.sort { |a,b| b[:time] <=> a[:time] }
-end
-
-cgit_url = "http://git.bogomips.org/cgit/raindrops.git"
-git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/raindrops.git'
-web_url = "http://raindrops.bogomips.org/"
-
-desc 'prints news as an Atom feed'
-task :news_atom do
-  require 'nokogiri'
-  new_tags = tags[0,10]
-  puts(Nokogiri::XML::Builder.new do
-    feed :xmlns => "http://www.w3.org/2005/Atom" do
-      id! "#{web_url}NEWS.atom.xml"
-      title "Raindrops news"
-      subtitle "real-time stats for Rack servers"
-      link! :rel => "alternate", :type => "text/html",
-            :href => "#{web_url}NEWS.html"
-      updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time])
-      new_tags.each do |tag|
-        entry do
-          title tag[:subject]
-          updated tag[:time]
-          published tag[:time]
-          author {
-            name tag[:tagger_name]
-            email tag[:tagger_email]
-          }
-          url = "#{cgit_url}/tag/?id=#{tag[:tag]}"
-          link! :rel => "alternate", :type => "text/html", :href =>url
-          id! url
-          message_only = tag[:body].split(/\n.+\(\d+\):\n {6}/s).first.strip
-          content({:type =>:text}, message_only)
-          content(:type =>:xhtml) { pre tag[:body] }
-        end
-      end
-    end
-  end.to_xml)
-end
-
-desc 'prints RDoc-formatted news'
-task :news_rdoc do
-  tags.each do |tag|
-    time = tag[:time].tr!('T', ' ').gsub!(/:\d\dZ/, ' UTC')
-    puts "=== #{tag[:tag].sub(/^v/, '')} / #{time}"
-    puts ""
-
-    body = tag[:body]
-    puts tag[:body].gsub(/^/sm, "  ").gsub(/[ \t]+$/sm, "")
-    puts ""
-  end
-end
-
-desc "print release changelog for Rubyforge"
-task :release_changes do
-  version = ENV['VERSION'] or abort "VERSION= needed"
-  version = "v#{version}"
-  vtags = tags.map { |tag| tag[:tag] =~ /\Av/ and tag[:tag] }.sort
-  prev = vtags[vtags.index(version) - 1]
-  if prev
-    system('git', 'diff', '--stat', prev, version) or abort $?
-    puts ""
-    system('git', 'log', "#{prev}..#{version}") or abort $?
-  else
-    system('git', 'log', version) or abort $?
-  end
-end
-
-desc "print release notes for Rubyforge"
-task :release_notes do
-  spec = Gem::Specification.load('raindrops.gemspec')
-  puts spec.description.strip
-  puts ""
-  puts "* #{spec.homepage}"
-  puts "* #{spec.email}"
-  puts "* #{git_url}"
-
-  _, _, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
-  print "\nChanges:\n\n"
-  puts body
-end
-
 desc "read news article from STDIN and post to rubyforge"
 task :publish_news do
   require 'rubyforge'