fnordmetric 0.6.5 → 0.6.6

data/Gemfile

@@ -2,6 +2,5 @@ source :rubygems
 
 gemspec
 
-gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"
-
 gem "rake"
+gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"

data/README.md

@@ -5,7 +5,7 @@ FnordMetric is a highly configurable (and pretty fast) realtime app/event
 tracking thing based on ruby eventmachine and redis. You define your own 
 plotting and counting functions as ruby blocks!
 
-[ ![Build status - Travis-ci][3] ][4]
+[ ![Build status - Travis-ci](https://secure.travis-ci.org/paulasmuth/fnordmetric.png) ](http://travis-ci.org/paulasmuth/fnordmetric) [ ![Dependency status - Gemnasium](https://gemnasium.com/paulasmuth/fnordmetric.png) ](https://gemnasium.com/paulasmuth/fnordmetric)
 
 [SCREENCAST][2]: the FnordMetric-instance we use to track our social dating app.
 

data/fnordmetric.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport"
 
   s.add_development_dependency "delorean"
-  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_development_dependency "shoulda"
 
   s.files         = `git ls-files`.split("\n") - [".gitignore", ".rspec", ".travis.yml"]

data/lib/fnordmetric.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext"
 require 'yajl'
 require 'sinatra/base'
 require 'haml'
-require 'thin'
+require 'rack/server'
 
 require "fnordmetric/version"
 
@@ -28,6 +28,7 @@ module FnordMetric
 
     opts[:inbound_stream] ||= ["0.0.0.0", "1337"]
     opts[:web_interface] ||= ["0.0.0.0", "4242"]
+    opts[:web_interface_server] ||= "thin"
 
     opts[:start_worker] ||= true
     opts[:print_stats] ||= 3
@@ -53,14 +54,16 @@ module FnordMetric
       app = embedded(opts)
 
       if opts[:web_interface]
-        begin
-          Thin::Server.start(*opts[:web_interface], app)
-          log "listening on http##{opts[:web_interface].join(":")}"
-        rescue Exception => e
-          log "cant start FnordMetric::App. port in use?"
+        server = opts[:web_interface_server].downcase
+        unless ["thin", "hatetepe"].include? server
+          raise "Need an EventMachine webserver, but #{server} isn't"
         end
-      end
 
+        host, port = *opts[:web_interface]
+        Rack::Server.start :app => app, :server => server,
+                           :Host => host, :Port => port
+        log "listening on http://#{host}:#{port}"
+      end
     end
   end
 

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/fnordmetric/worker.rb

@@ -24,7 +24,7 @@ class FnordMetric::Worker
       if event_id
         @redis.get(event_key(event_id)).callback do |event_data|                     
           process_event(event_id, event_data) if event_data        
-          FnordMetric.log("event_lost: event_data not found for event-id '#{event_id}'") unless event_data
+          FnordMetric.log("event_lost: event_data not found for event-id '#{event_id}' - maybe expired?") unless event_data
           @redis.hincrby(stats_key, :events_processed, 1)
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: fnordmetric
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Paul Asmuth
@@ -175,7 +175,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: 2.8.0
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency