panmind-usage-tracker 0.4.0 → 1.0.1

data/lib/usage_tracker/reactor.rb

@@ -1,7 +1,4 @@
-#!/usr/bin/env ruby
-
 require 'usage_tracker'
-require 'eventmachine'
 require 'json'
 
 module UsageTracker
@@ -15,16 +12,6 @@ module UsageTracker
       end
     end
 
-    # Debug hook
-    if UsageTracker.env == 'test'
-      alias :real_receive_data :receive_data
-      def receive_data(data)
-        UsageTracker.log.debug "Received #{data.inspect}"
-        ret = real_receive_data(data)
-        UsageTracker.log.debug ret ? "Stored #{ret}" : 'Failed to store input data'
-      end
-    end
-
     private
       def parse(data)
         JSON(data).tap {|h| h.reject! {|k,v| v.nil?}}
@@ -57,8 +44,8 @@ module UsageTracker
         tries = 0
 
         begin
-          doc['_id'] = make_id
-          UsageTracker.database.save_doc(doc)
+          UsageTracker.log.debug "Received #{doc.inspect}" 
+          UsageTracker.adapter.save_doc(doc)
 
         rescue RestClient::Conflict => e
           if (tries += 1) < 10
@@ -68,65 +55,10 @@ module UsageTracker
             UsageTracker.log.error "Losing '#{doc.inspect}' because of too many conflicts"
           end
 
-        rescue Encoding::UndefinedConversionError
+        rescue 
           UsageTracker.log.error "Losing '#{doc.inspect}' because #$!" # FIXME handle this error properly
         end
       end
-
-      # Timestamp as _id has the advantage that documents
-      # are sorted automatically by CouchDB.
-      #
-      # Eventual duplication (multiple servers) is (possibly)
-      # avoided by adding a random digit at the end.
-      #
-      def make_id
-        Time.now.to_f.to_s.ljust(16, '0') + rand(10).to_s
-      end
-  end
-
-  connect!
-
-  # Setup signal handlers
-  #
-  #  * INT, TERM: graceful exit
-  #  * USR1     : rotate logs
-  #
-  def self.sigexit(sig)
-    log "Received SIG#{sig}"
-    EventMachine.stop_event_loop
-  end
-
-  trap('INT')  { sigexit 'INT'  }
-  trap('TERM') { sigexit 'TERM' }
-  trap('USR1') { log.rotate  }
-
-  # Run the Event Loop
-  #
-  EventMachine.run do
-    begin
-      host, port = UsageTracker.settings.host, UsageTracker.settings.port
-
-      unless (1024..65535).include? port.to_i
-        raise "Please set a listening port between 1024 and 65535"
-      end
-
-      EventMachine.open_datagram_socket host, port, Reactor
-      log "Listening on #{host}:#{port} UDP"
-      write_pid!
-
-      $stderr.puts "Started, logging to #{log.path}"
-      [$stdin, $stdout, $stderr].each {|io| io.reopen '/dev/null'}
-
-    rescue Exception => e
-      message = e.message == 'no datagram socket' ? "Unable to bind #{host}:#{port}" : e
-      log.fatal message
-      $stderr.puts message unless $stderr.closed?
-      EventMachine.stop_event_loop
-      exit 1
-    end
   end
 
-  # Goodbye!
-  #
-  log 'Exiting'
 end

data/lib/usage_tracker/runner.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby 
+
+# This is the runner script where EventMachine gets 
+# actually invocated.
+# Behaviour is defined in the UsageTracker::Reactor module 
+
+$:<< File.expand_path(File.dirname(__FILE__) +  '/..')
+
+require 'usage_tracker'
+require 'usage_tracker/reactor'
+require 'eventmachine'
+
+module UsageTracker
+
+  connect!
+
+  # Setup signal handlers
+  #
+  #  * INT, TERM: graceful exit
+  #  * USR1     : rotate logs
+  #
+  def self.sigexit(sig)
+    log "Received SIG#{sig}"
+    EventMachine.stop_event_loop
+  end
+
+  trap('INT')  { sigexit 'INT'  }
+  trap('TERM') { sigexit 'TERM' }
+  trap('USR1') { log.rotate  }
+
+  # Run the Event Loop
+  #
+  EventMachine.run do
+    begin
+
+      run! 
+
+      $stderr.puts "Started, logging to #{log.path}"
+      [$stdin, $stdout, $stderr].each {|io| io.reopen '/dev/null'}
+
+    rescue Exception => e
+      message = e.message == 'no datagram socket' ? "Unable to bind #{UsageTracker.settings.host}:#{UsageTracker.settings.port}" : e
+      log.fatal message
+      $stderr.puts message unless $stderr.closed?
+      EventMachine.stop_event_loop
+      exit 1
+    end
+  end
+
+  # Goodbye!
+  #
+  log 'Exiting'
+end 
+  

data/panmind-usage-tracker.gemspec

@@ -5,56 +5,94 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panmind-usage-tracker}
-  s.version = "0.4.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcello Barnaba", "Christian Wo\u0308rner"]
-  s.date = %q{2010-12-03}
+  s.authors = ["Marcello Barnaba", "Christian Wörner", "Fabrizio Regini"]
+  s.date = %q{2011-05-25}
   s.default_executable = %q{usage_tracker}
-  s.description = %q{This software implements a Rails 3 Middleware and an EventMachine reactor to store into CouchDB the results of HTTP request processing}
-  s.email = %q{vjt@openssl.it}
+  s.description = %q{This software implements a Rails 3 Middleware and an EventMachine reactor to store into a database the results of HTTP request processing}
+  s.email = %q{info@panmind.org}
   s.executables = ["usage_tracker"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    "Gemfile",
     "README.md",
     "Rakefile",
     "VERSION",
     "bin/usage_tracker",
     "config/usage_tracker.yml.sample",
     "config/usage_tracker_upstart.conf",
-    "config/views.yml",
     "lib/usage_tracker.rb",
+    "lib/usage_tracker/adapter.rb",
+    "lib/usage_tracker/adapters/couchdb.rb",
+    "lib/usage_tracker/adapters/mongodb.rb",
     "lib/usage_tracker/context.rb",
     "lib/usage_tracker/log.rb",
     "lib/usage_tracker/middleware.rb",
     "lib/usage_tracker/railtie.rb",
     "lib/usage_tracker/reactor.rb",
-    "middleware_test.rb"
+    "lib/usage_tracker/runner.rb",
+    "panmind-usage-tracker.gemspec",
+    "spec/spec_helper.rb",
+    "spec/usage_tracker_spec.rb"
   ]
   s.homepage = %q{http://github.com/Panmind/usage_tracker}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Write your application request logs in CouchDB}
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Write your application request logs on CouchDB or MongoDB}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0"])
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_runtime_dependency(%q<freegenie-em-spec>, ["= 0.2.3"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0"])
+      s.add_runtime_dependency(%q<bson>, [">= 0"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
     else
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<mongo>, [">= 0"])
+      s.add_dependency(%q<couchrest>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<freegenie-em-spec>, ["= 0.2.3"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<couchrest>, [">= 0"])
+      s.add_dependency(%q<mongo>, [">= 0"])
+      s.add_dependency(%q<bson>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
     end
   else
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<mongo>, [">= 0"])
+    s.add_dependency(%q<couchrest>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<freegenie-em-spec>, ["= 0.2.3"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<couchrest>, [">= 0"])
+    s.add_dependency(%q<mongo>, [">= 0"])
+    s.add_dependency(%q<bson>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
   end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+
+$:<<  File.dirname(__FILE__) + '/../lib/' 
+
+
+
+

data/spec/usage_tracker_spec.rb

@@ -0,0 +1,39 @@
+require File.join( File.dirname( File.expand_path(__FILE__) )  , 'spec_helper' )  
+
+require 'usage_tracker'
+require 'em-spec/rspec'
+require 'usage_tracker/reactor'
+
+describe UsageTracker::Reactor do 
+  include EM::Spec
+
+  # Not a great test, ensures the run! method does not crash, at least
+  it "should run the reactor" do
+    EM.run do 
+      UsageTracker.connect! 
+      UsageTracker.run!
+      done
+    end
+  end
+
+  it "should accept valid keys" do
+    EM.run do 
+      UsageTracker.connect! 
+      UsageTracker.run!
+      UDPSocket.open do |sock|
+        sock.connect(UsageTracker.settings.host, UsageTracker.settings.port.to_i)
+        sock.write_nonblock({:env => 'env!', :duration => '10.2', :status => '200'}.to_json) 
+      end
+      done
+    end
+  end
+
+  
+end
+
+
+
+
+
+
+

metadata

@@ -1,65 +1,176 @@
 --- !ruby/object:Gem::Specification 
 name: panmind-usage-tracker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors: 
 - Marcello Barnaba
 - "Christian Wo\xCC\x88rner"
+- Fabrizio Regini
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2011-05-25 00:00:00 +02:00
 default_executable: usage_tracker
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
+  name: bson_ext
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
+  name: mongo
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: couchrest
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
-description: This software implements a Rails 3 Middleware and an EventMachine reactor to store into CouchDB the results of HTTP request processing
-email: vjt@openssl.it
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: freegenie-em-spec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: couchrest
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: mongo
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: bson
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id014
+description: This software implements a Rails 3 Middleware and an EventMachine reactor to store into a database the results of HTTP request processing
+email: info@panmind.org
 executables: 
 - usage_tracker
 extensions: []
@@ -67,21 +178,26 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- Gemfile
 - README.md
 - Rakefile
 - VERSION
 - bin/usage_tracker
 - config/usage_tracker.yml.sample
 - config/usage_tracker_upstart.conf
-- config/views.yml
 - lib/usage_tracker.rb
+- lib/usage_tracker/adapter.rb
+- lib/usage_tracker/adapters/couchdb.rb
+- lib/usage_tracker/adapters/mongodb.rb
 - lib/usage_tracker/context.rb
 - lib/usage_tracker/log.rb
 - lib/usage_tracker/middleware.rb
 - lib/usage_tracker/railtie.rb
 - lib/usage_tracker/reactor.rb
-- middleware_test.rb
+- lib/usage_tracker/runner.rb
 - panmind-usage-tracker.gemspec
+- spec/spec_helper.rb
+- spec/usage_tracker_spec.rb
 has_rdoc: true
 homepage: http://github.com/Panmind/usage_tracker
 licenses: []
@@ -96,23 +212,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Write your application request logs in CouchDB
+summary: Write your application request logs on CouchDB or MongoDB
 test_files: []