iron_mq 2.1.2 → 2.1.3

data/lib/iron_mq/queues.rb

@@ -142,7 +142,7 @@ module IronMQ
     def poll(options={}, &blk)
       sleep_duration = options[:sleep_duration] || 1
       while true
-        p options
+        #p options
         msg = get(options)
         if msg.nil?
           if options[:break_if_nil]
@@ -150,9 +150,10 @@ module IronMQ
           else
             sleep sleep_duration
           end
+        else
+          yield msg
+          msg.delete
         end
-        yield msg
-        msg.delete
       end
     end
 

data/lib/iron_mq/version.rb

@@ -1,3 +1,3 @@
 module IronMQ
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/test/long_run.rb

@@ -11,12 +11,16 @@ end
 require_relative 'long_run_worker'
 
 @config = UberConfig.load
-@num_to_add = 1000
+@num_to_add = 10000
+
+p @config
 
 worker = LongRunWorker.new
-worker.queue_name = "concur5"
 worker.config = @config
+worker.queue_name = "concur8"
+worker.num_threads = 100
 worker.num_to_add = @num_to_add
+worker.skip_get_and_delete = false
 worker.run
 #worker.queue
 #status = worker.wait_until_complete

data/test/long_run_worker.rb

@@ -3,7 +3,7 @@ require 'iron_mq'
 
 class LongRunWorker
 
-  attr_accessor :config, :num_to_add, :queue_name
+  attr_accessor :config, :num_to_add, :queue_name, :skip_get_and_delete, :num_threads
 
   def run
 
@@ -14,7 +14,7 @@ class LongRunWorker
 
     start = Time.now
     puts "Queuing #{@num_to_add} items at #{start}..."
-    executor = Concur::Executor.new_thread_pool_executor(50)
+    executor = Concur::Executor.new_thread_pool_executor(num_threads || 20)
     @num_to_add.times do |i|
       task = executor.execute do
         begin
@@ -35,6 +35,7 @@ class LongRunWorker
       sleep 2
     end
     put_time = (Time.now.to_f - start.to_f)
+    sleep 1
     puts "Finished pushing in #{put_time} seconds"
 
     queue = @client.queue(queue_name)
@@ -43,23 +44,26 @@ class LongRunWorker
 
     #exit if true
 
-    start = Time.now
-    puts "Getting and deleting #{@num_to_add} items at #{start}..."
-    @num_to_add.times do |i|
-      task = executor.execute do
-        puts "GET #{i}..."
-        res = queue.get()
-        p res
-        puts "DELETE #{i}..."
-        res = queue.delete(res.id)
-        p res
+    if skip_get_and_delete
+      start = Time.now
+      puts "Getting and deleting #{@num_to_add} items at #{start}..."
+      @num_to_add.times do |i|
+        task = executor.execute do
+          puts "GET #{i}..."
+          res = queue.get()
+          p res
+          puts "DELETE #{i}..."
+          res = queue.delete(res.id)
+          p res
+        end
       end
-    end
-    i = 0
-    while executor.queue_size > 0 do
-      i += 1
-      puts "waiting #{i}, queue size=#{executor.queue_size}"
-      sleep 2
+      i = 0
+      while executor.queue_size > 0 do
+        i += 1
+        puts "waiting #{i}, queue size=#{executor.queue_size}"
+        sleep 2
+      end
+      sleep 1
     end
 
     queue = @client.queue(queue_name)

data/test/quick_run.rb

@@ -1,4 +1,3 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
 require_relative 'test_base'
 
 class QuickRun < TestBase

data/test/test_beanstalkd.rb

@@ -1,7 +1,3 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
-
-#$abt_config = {:hello=>'abt_config_ya'}
-
 gem 'test-unit'
 require 'test/unit'
 require 'beanstalk-client'

data/test/test_iron_mq.rb

@@ -1,7 +1,3 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
-
-#$abt_config = {:hello=>'abt_config_ya'}
-
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
@@ -43,7 +39,7 @@ class IronMQTests < TestBase
 
     queue = @client.queues.get(:name => @client.queue_name)
     p queue
-    assert queue.reload.size == 1, "Size was not 1 after insert, it was: #{queue.size}"
+    assert_equal 1, queue.reload.size
     res = @client.messages.get()
     p res
     assert res["id"]
@@ -54,10 +50,10 @@ class IronMQTests < TestBase
     puts "shouldn't be any more"
     res = @client.messages.get()
     p res
-    assert res.nil?
+    assert_nil res
 
     queue = @client.queues.get(:name => @client.queue_name)
-    assert queue.size == 0
+    assert_equal 0, queue.size
 
     res = @client.messages.post("hello world 2!")
     p res
@@ -72,7 +68,7 @@ class IronMQTests < TestBase
     puts "shouldn't be any more"
     res = @client.messages.get()
     p res
-    assert res.nil?
+    assert_nil res
 
 
     # new style of referencing queue
@@ -86,14 +82,14 @@ class IronMQTests < TestBase
     p res
     assert res["id"]
     assert res.id
-    assert res.body == v
+    assert_equal v, res.body
 
     res = queue.delete(res.id)
     p res
     puts "shouldn't be any more"
     res = queue.get()
     p res
-    assert res.nil?
+    assert_nil res
 
     # test delete by item
     res = queue.post(v)
@@ -108,7 +104,7 @@ class IronMQTests < TestBase
     puts "shouldn't be any more"
     res = queue.get()
     p res
-    assert res.nil?
+    assert_nil res
 
   end
 
@@ -126,21 +122,21 @@ class IronMQTests < TestBase
 
     msg4 = @client.messages.get()
     p msg4
-    assert msg4.nil?
+    assert_nil msg4
 
     puts 'sleeping 45 seconds...'
     sleep 45
 
     msg3 = @client.messages.get()
     p msg3
-    assert msg3.nil?
+    assert_nil msg3
 
     puts 'sleeping another 45 seconds...'
     sleep 45
 
     msg2 = @client.messages.get()
     assert msg2
-    assert msg.id == msg2.id
+    assert_equal msg2.id, msg.id
 
     msg2.delete
 
@@ -152,12 +148,12 @@ class IronMQTests < TestBase
     assert msg
     msg4 = @client.messages.get()
     p msg4
-    assert msg4.nil?
+    assert_nil msg4
     puts 'sleeping 15 seconds...'
     sleep 15
     msg2 = @client.messages.get()
     assert msg2
-    assert msg.id == msg2.id
+    assert_equal msg2.id, msg.id
 
   end
 
@@ -183,7 +179,7 @@ class IronMQTests < TestBase
     res.each do |q|
       p q.name
     end
-    assert res.size == 0
+    assert_equal 0, res.size
 
 
     queue = @client.queue("test_basics_6")
@@ -202,7 +198,7 @@ class IronMQTests < TestBase
     @client.messages.post(msgTxt, {:delay => 10})
     msg = @client.messages.get
     p msg
-    assert msg.nil?
+    assert_nil msg
     sleep 10
     msg = @client.messages.get
     p msg
@@ -221,7 +217,7 @@ class IronMQTests < TestBase
     resp = @client.messages.post(x)
     assert resp["ids"]
     assert resp["ids"].is_a?(Array)
-    assert resp["ids"].size == 10
+    assert_equal 10, resp["ids"].size
 
     msg = @client.messages.get()
     assert msg
@@ -248,31 +244,31 @@ class IronMQTests < TestBase
     puts "msg_id: #{msg_id}"
     msg = @client.messages.get
     p msg
-    assert msg.id == msg_id
+    assert_equal msg_id, msg.id
     # Ok, so should have received same message, now let's release it quicker than the original timeout
 
     # but first, ensure the next get is nil
     msg = @client.messages.get
     p msg
-    assert msg.nil?
+    assert_nil msg
 
     # now release it instantly
     @client.messages.release(msg_id)
     msg = @client.messages.get
     p msg
     assert msg
-    assert msg.id == msg_id
+    assert_equal msg_id,  msg.id
 
     # ok, so should be reserved again
     msgr = @client.messages.get
     p msgr
-    assert msgr.nil?
+    assert_nil msgr
 
     # let's release it in 10 seconds
     @client.messages.release(msg_id, :delay => 10)
     msg = @client.messages.get
     p msg
-    assert msg.nil?
+    assert_nil msg
 
     sleep 11
 
@@ -283,7 +279,7 @@ class IronMQTests < TestBase
     msg.release(:delay => 5)
     msg = @client.messages.get
     p msg
-    assert msg.nil?
+    assert_nil msg
 
     sleep 6
 
@@ -301,16 +297,16 @@ class IronMQTests < TestBase
 
     val = "hi mr clean"
     q.post(val)
-    assert q.size == 1
 
-    q.clear
-    msg = q.get
-    assert msg.nil?
+    sleep 0.5 # make sure the counter has time to update
+    assert_equal 1, q.size
 
-    q.reload
+    q.clear
 
-    assert q.reload.size == 0, "Size was not zero after clear, it was: #{q.size}"
+    msg = q.get
+    assert_nil msg
 
+    assert_equal 0, q.reload.size
   end
 
 
@@ -329,9 +325,10 @@ class IronMQTests < TestBase
       assert msg.body.include?("hello")
       i += 1
     end
-    assert i == 5, "Polled #{i} messages, but there should have only been five messages in queue. "
 
-    assert queue.reload.size == 0, "Size was not zero after poll, it was: #{queue.size}"
+    assert_equal 5, i
+
+    assert_equal 0, queue.reload.size
 
   end
   #

data/test/tmp.rb

@@ -1,7 +1,3 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
-
-#$abt_config = {:hello=>'abt_config_ya'}
-
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
@@ -11,6 +7,39 @@ class IronMQTests < TestBase
   def setup
     super
 
+    @queue_name = "fixed_num2_migration"
+
+  end
+
+  def test_put_x
+    q = @client.queue(@queue_name)
+    1000.times do |i|
+      puts "#{i}"
+      q.post("msg #{i}")
+    end
+    p q.reload.size
+    assert_equal 1800, q.size
+  end
+
+  def test_get_x
+    #q = @client.queue(@queue_name)
+    #puts "q.size: #{q.size}"
+    #100.times do |i|
+       # puts "#{i}"
+    #  msg = q.get
+    #  msg.delete
+    #end
+    #p q.reload.size
+    #assert_equal 900, q.reload.size
   end
+  #
+  #def test_poll_all
+  #  q = @client.queue(@queue_name)
+  #  puts "q.size: #{q.size}"
+  #  q.poll do |msg|
+  #    p msg
+  #  end
+  #  p queue.reload.size
+  #end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core