conveyor 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.2 / 2008-04-10
+* make sure that an empty channel still has @last_id set
+* switch back to mongrel. too many problems with event machine on solaris
+* add logging for 404s. should probably switch this to a rack middleware
+* adding a verbose mode, that dumps debug output to stdout
+
 == 0.2.1 / 2008-02-29
 * added get by timestamp and rewind to timestamp (for groups, too)
 

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.new('conveyor', Conveyor::VERSION) do |p|
   p.author = 'Ryan King'
   p.email = 'ryan@theryanking.com'
   p.remote_rdoc_dir = ''
-  p.extra_deps << ['thin']
+  p.extra_deps << ['mongrel']
   p.extra_deps << ['json']
   p.extra_deps << ['daemons']
 end

data/bin/conveyor

@@ -3,7 +3,7 @@
 require 'optparse'
 require 'rubygems'
 require 'daemons/daemonize'
-require 'thin'
+require 'rack'
 
 options = {:port => 8011, :daemonize => false}
 opts = OptionParser.new do |opts|
@@ -27,6 +27,10 @@ opts = OptionParser.new do |opts|
   opts.on("--unsafe", "Unsafe Mode.") do |d|
     options[:unsafe] = d
   end
+  
+  opts.on("--verbose", "Verbose mode. For debugging only.") do |d|
+    options[:verbose] = d
+  end
 end
 
 opts.parse!
@@ -44,9 +48,13 @@ if options[:daemonize]
   Daemonize.daemonize
 end
 
-Thin::Server.start('0.0.0.0', options[:port]) do
+app = Rack::Builder.new do
   map '/channels' do
-    run Conveyor::App.new(ARGV[0], :log_directory => options[:log_directory], :unsafe_mode => options[:unsafe])
+    run Conveyor::App.new(ARGV[0], 
+          :log_directory => options[:log_directory], 
+          :unsafe_mode   => options[:unsafe], 
+          :verbose       => options[:verbose])
   end
 end
 
+Rack::Handler::Mongrel.run(app, {:Host => '0.0.0.0', :Port => options[:port]})

data/lib/conveyor.rb

@@ -1,4 +1,4 @@
 module Conveyor
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   QUALITY = 'alpha'
 end

data/lib/conveyor/base_channel.rb

@@ -186,6 +186,7 @@ module Conveyor
 
       @index_file = File.open(index_path, 'r+')
 
+      @last_id = 0
       @index_file.each_line do |line|
         @index << parse_headers(line.strip, true)
         @last_id = @index.last[:id]

data/lib/conveyor/channel.rb

@@ -43,7 +43,7 @@ module Conveyor
       r = nil
       group_iterator_lock(group) do
         @group_iterators[group] = 1 unless @group_iterators.key?(group)
-        if @iterator <= @last_id
+        if @group_iterators[group] <= @last_id
           r = get(@group_iterators[group])
           @group_iterators[group] += 1
           group_iterators_file(group) do |f|

data/lib/conveyor/server.rb

@@ -4,6 +4,7 @@ require 'conveyor/channel'
 require 'fileutils'
 require 'json'
 require 'logger'
+require 'pp'
 
 module Conveyor
   class App
@@ -12,6 +13,7 @@ module Conveyor
       @data_directory = data_directory
       @log_directory  = options[:log_directory]
       @unsafe_mode    = options[:unsafe_mode] # allows deleting of channels. REALLY UNSAFE!
+      @verbose        = options[:verbose]
 
       if @log_directory
         @logger = Logger.new File.join(@log_directory, 'conveyor.log')
@@ -90,6 +92,7 @@ module Conveyor
         create_new_channel(m.captures[0])
         post(env, m)
       else
+        i "#{env["REMOTE_ADDR"]} #{env["REQUEST_METHOD"]} #{env["REQUEST_PATH"]} 404"
         [404, {}, '']
       end
     end
@@ -145,6 +148,7 @@ module Conveyor
         return [200, {}, list.to_json]
       end
 
+      i "#{env["REMOTE_ADDR"]} #{env["REQUEST_METHOD"]} #{env["REQUEST_PATH"]} 404"
       return [404, {}, '']
     end
 
@@ -157,6 +161,9 @@ module Conveyor
     end
 
     def call(env)
+      if @verbose
+        pp env
+      end
       @requests += 1
       if env['REQUEST_METHOD']    == 'PUT'  && m = path_match(env, %r{/channels/(.*)})
         put(env, m)
@@ -167,6 +174,7 @@ module Conveyor
       elsif env['REQUEST_METHOD'] == 'GET'
         get(env)
       else
+        i "#{env["REMOTE_ADDR"]} #{env["REQUEST_METHOD"]} #{env["REQUEST_PATH"]} 404"
         [404, {}, '']
       end
     end

data/test/test_replicated_channel.rb

@@ -1,6 +1,7 @@
 require "test/unit"
 require 'fileutils'
 require "conveyor/replicated_channel"
+require 'priority_queue'
 
 class TestReplicatedChannel < Test::Unit::TestCase
   def test_basic

data/test/test_server.rb

@@ -2,7 +2,7 @@ require "test/unit"
 require "conveyor/server"
 require 'net/http'
 require 'conveyor/client'
-require 'thin'
+require 'rack'
 
 class TestConveyorServer < Test::Unit::TestCase
   include Conveyor
@@ -11,12 +11,14 @@ class TestConveyorServer < Test::Unit::TestCase
   FileUtils.mkdir('/tmp/asdf')
 
   Thread.start do
-    Thin::Server.start('0.0.0.0', 8011) do
+    app = Rack::Builder.new do
       map '/channels' do
-        run Conveyor::App.new('/tmp/asdf',  :unsafe_mode => true)
+        run Conveyor::App.new('/tmp/asdf', :unsafe_mode => true)
       end
     end
-  end
+
+    Rack::Handler::Mongrel.run(app, :Host => '0.0.0.0', :Port => 8011)
+   end
 
   def test_channels
     Net::HTTP.start("localhost", 8011) do |h|
@@ -148,7 +150,7 @@ class TestConveyorServer < Test::Unit::TestCase
       
       assert_kind_of Net::HTTPNotFound, req
       
-      req = h.post("/channels/#{chan}?rewind_id=1", nil)
+      req = h.post("/channels/#{chan}?rewind_id=1", nil, {'Content-Type' => 'application/octet-stream'})
       assert_kind_of Net::HTTPOK, req
       
       req = h.get("/channels/#{chan}?next")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: conveyor
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan King
@@ -30,11 +30,11 @@ cert_chain:
   Zls3y84CmyAEGg==
   -----END CERTIFICATE-----
 
-date: 2008-02-29 00:00:00 -08:00
+date: 2008-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: mongrel
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -67,7 +67,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     version: 
 description: "* Like TiVo for your data * A distributed rewindable multi-queue"
 email: ryan@theryanking.com
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: conveyor
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: "* Like TiVo for your data * A distributed rewindable multi-queue"