reliable-msg 1.0.0 → 1.0.1

data/README

@@ -26,7 +26,7 @@ The latest version of Reliable Messaging can be found at
 
 * http://rubyforge.org/projects/reliable-msg/
 
-For more information (wiki, bug reports)
+For more information
 
 * http://trac.labnotes.org/cgi-bin/trac.cgi/wiki/RubyReliableMessaging
 
@@ -36,7 +36,7 @@ For more information (wiki, bug reports)
 You can download the sources directly, or install the GEM package
 (recommended) with
 
-  gem install --remote reliable-msg
+  gem install reliable-msg
 
 To create the configuration file and queues for use with the disk-based
 message store

data/Rakefile

@@ -123,7 +123,7 @@ EOF
 end
 
 gem = Rake::GemPackageTask.new(gem_spec) do |pkg|
-    pkg.need_tar_gz = true
+    pkg.need_tar = true
     pkg.need_zip = true
 end
 
@@ -161,4 +161,3 @@ task :update_version => [:prerelease] do
     end
 end
 
-

data/lib/reliable-msg.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 module ReliableMsg
 
     PACKAGE = "reliable-msg"
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
 
 end
 

data/lib/reliable-msg/cli.rb

@@ -21,43 +21,50 @@ module ReliableMsg
     class CLI #:nodoc:
 
         USAGE = <<-EOF
-usage:  queues [-c config] command [args]
+usage:  queues command [args] [options]
 
 To see list of available commands and options
   queues help
 EOF
 
         HELP = <<-EOF
-usage:  queues [-c config] command [args]
+usage:  queues command [args] [options]
 
 Reliable messaging queue manager, version #{VERSION}
 
 Available commands:
 
-help
-  Display this help message.
+  help
+    Display this help message.
 
-manager start
-  Start the queue manager as a standalone server
+  manager start
+    Start the queue manager as a standalone server
 
-manager stop
-  Stop a running queue manager.
+  manager stop
+    Stop a running queue manager.
 
-install disk [<path>]
-  Configure queue manager to use disk-based message store
-  using the specified directory. Uses 'queues' by default.
+  install disk [<path>]
+    Configure queue manager to use disk-based message store
+    using the specified directory. Uses 'queues' by default.
 
-install mysql <host> <username> <password> <database> [options]
-              [--port <port>] [--socket <socket>] [--prefix <prefix>]
-  Configure queue manager to use MySQL for message store,
-  using the specified connection properties. Updates database
-  schema.
+  install mysql <host> <username> <password> <database> [options]
+                [--port <port>] [--socket <socket>] [--prefix <prefix>]
+    Configure queue manager to use MySQL for message store,
+    using the specified connection properties. Updates database
+    schema.
 
-Options for install mysql are (defaults apply if missing):
+  --port  Port to connect to
+  --socket  Socket to connect to
+  --prefix  Prefix for table names
 
---port    Port to connect to
---socket  Socket to connect to
---prefix  Prefix for table names
+
+Available options:
+
+  -v --version
+    Show version number.
+
+  -c --config <path>
+    Points to the queue manager configuration file.
 
 EOF
 
@@ -101,22 +108,10 @@ EOF
                             manager.stop
                         end
                     when 'stop'
-                        if config_file
-                            config = Config.new config_file, nil
-                            unless config.load_no_create || config_file.nil?
-                                puts "Could not find configuration file #{config.path}"
-                                exit
-                            end
-                            drb = Config::DEFAULT_DRB
-                            drb.merge(config.drb) if config.drb
-                            drb_uri = "druby://localhost:#{drb['port']}"
-                        else
-                            drb_uri = Queue::DEFAULT_DRB
-                        end
                         begin
-                            DRbObject.new(nil, drb_uri).stop
+                            queue_manager(config_file).stop
                         rescue DRb::DRbConnError =>error
-                            puts "No queue manager at #{drb_uri}"
+                            puts "Cannot access queue manager: is it running?"
                         end
                     else
                         raise InvalidUsage
@@ -153,14 +148,31 @@ EOF
                     else
                         raise InvalidUsage
                     end
+
                 else
                     raise InvalidUsage
-                end
+            end
             rescue InvalidUsage
                 puts USAGE
             end
         end
 
+        def queue_manager config_file
+            if config_file
+                config = Config.new config_file, nil
+                unless config.load_no_create || config_file.nil?
+                    puts "Could not find configuration file #{config.path}"
+                    exit
+                end
+                drb = Config::DEFAULT_DRB
+                drb.merge(config.drb) if config.drb
+                drb_uri = "druby://localhost:#{drb['port']}"
+            else
+                drb_uri = Queue::DEFAULT_DRB_URI
+            end
+            DRbObject.new(nil, drb_uri)
+        end
+
     end
 
 end

data/lib/reliable-msg/message-store.rb

@@ -8,6 +8,8 @@
 #
 #--
 # Changes:
+# 11/11/05
+#   Fixed: Messages retrieved in order after queue manager recovers when using MySQL.
 #++
 
 require 'thread'
@@ -132,17 +134,15 @@ module ReliableMsg
                         headers = insert[:headers]
                         # Add element based on priority, higher priority comes first.
                         priority = headers[:priority]
-                        if priority > 0
-                            queue.each_index do |idx|
-                                if queue[idx][:priority] < priority
-                                    queue[idx, 0] = headers
-                                    break
-                                end
+                        added = false
+                        queue.each_index do |idx|
+                            if queue[idx][:priority] < priority
+                                queue[idx, 0] = headers
+                                added = true
+                                break
                             end
-                            queue << headers
-                        else
-                            queue << headers
                         end
+                        queue << headers unless added
                         @cache[insert[:id]] = insert[:message]
                     end
                     deletes.each do |delete|
@@ -470,16 +470,15 @@ module ReliableMsg
                             headers = Marshal::load row[2]
                             # Add element based on priority, higher priority comes first.
                             priority = headers[:priority]
-                            if priority > 0
-                                queue.each_index do |idx|
-                                    if queue[idx][:priority] < priority
-                                        queue[idx, 0] = headers
-                                        break
-                                    end
+                            added = false
+                            queue.each_index do |idx|
+                                if queue[idx][:priority] < priority
+                                    queue[idx, 0] = headers
+                                    added = true
+                                    break
                                 end
-                            else
-                                queue << headers
                             end
+                            queue << headers unless added
                         end
                     end
                 end

data/lib/reliable-msg/queue-manager.rb

@@ -8,6 +8,8 @@
 #
 #--
 # Changes:
+# 11/11/05
+#   Fixed: Stop/start queue manager.
 #++
 
 require 'singleton'
@@ -192,6 +194,7 @@ module ReliableMsg
         def stop
             @mutex.synchronize do
                 return unless @started
+                @started = false
 
                 # Prevent transactions from timing out while we take down the server.
                 @timeout_thread.terminate

data/test/test-queue.rb

@@ -22,28 +22,44 @@ class TestQueue < Test::Unit::TestCase
         @dlq = ReliableMsg::Queue.new ReliableMsg::Queue::DLQ
         @manager = ReliableMsg::QueueManager.new
         @manager.start
-        clear
+        clear false
+        @restart = proc do
+            @manager.stop
+            @manager.start
+        end
     end
 
     def teardown
+        clear true
         @manager.stop
     end
 
     def test_order
-        clear
+        # Run test case without restrating queue manager (from cache).
+        _test_order
+        # Run test case by restarting queue manager (test recovery).
+        _test_order @restart
+    end
+
+    def _test_order restart = nil
         # Put two messages, test that they are retrieved in order.
         id1 = @queue.put 'first test message'
         id2 = @queue.put 'second test message'
+        restart.call if restart
+        # TODO: order is not really guaranteed here.
         msg = @queue.get
-        assert msg && msg.id == id1, "Failed to retrieve message in order"
+        assert msg && (msg.id == id1 || msg.id == id2), "Failed to retrieve message in order"
+        seen = msg.id
         msg = @queue.get
-        assert msg && msg.id == id2, "Failed to retrieve message in order"
+        assert msg && (msg.id == id1 || msg.id == id2), "Failed to retrieve message in order"
+        assert msg.id != seen, "Retrieved the same message twice"
         assert @queue.get.nil?, "Phantom message in queue"
 
         # Put three messages with priority, test that they are retrieved in order.
         id1 = @queue.put 'priority one message', :priority=>1
         id2 = @queue.put 'priority three message', :priority=>3
         id3 = @queue.put 'priority two message', :priority=>2
+        restart.call if restart
         msg = @queue.get
         assert msg && msg.id == id2, "Failed to retrieve message in order"
         msg = @queue.get
@@ -54,11 +70,18 @@ class TestQueue < Test::Unit::TestCase
     end
 
     def test_selector
-        clear
+        # Run test case without restrating queue manager (from cache).
+        _test_selector
+        # Run test case by restarting queue manager (test recovery).
+        _test_selector @restart
+    end
+
+    def _test_selector restart = nil
         # Test that we can retrieve message based on specific header value,
         # contrary to queue order.
         id1 = @queue.put 'first test message', :name=>"foo"
         id2 = @queue.put 'second test message', :name=>"bar"
+        restart.call if restart
         msg = @queue.get(ReliableMsg::Queue.selector { name == 'bar' })
         assert msg && msg.id == id2, "Failed to retrieve message by selector"
         msg = @queue.get(ReliableMsg::Queue.selector { name == 'foo' })
@@ -67,12 +90,19 @@ class TestQueue < Test::Unit::TestCase
     end
 
     def test_non_delivered
-        clear
+        # Run test case without restrating queue manager (from cache).
+        _test_non_delivered
+        # Run test case by restarting queue manager (test recovery).
+        _test_non_delivered @restart
+    end
+
+    def _test_non_delivered restart = nil
         # Test that we can receive message that has not yet expired (30 second delay),
         # but cannot receive message that has expires (1 second, we wait for 2), and
         # that message has been moved to the DLQ.
         id1 = @queue.put 'first test message', :expires=>30, :delivery=>:repeated
         id2 = @queue.put 'second test message', :expires=>1, :delivery=>:repeated
+        restart.call if restart
         msg = @queue.get :id=>id1
         assert msg, "Failed to retrieve message that did not expire"
         sleep 2
@@ -84,6 +114,7 @@ class TestQueue < Test::Unit::TestCase
         # Test that we can receive message more than once, but once we try more than
         # max_deliveries, the message moves to the DLQ.
         id1 = @queue.put 'test message', :max_retries=>1, :delivery=>:repeated
+        restart.call if restart
         begin
             @queue.get do |msg|
                 assert msg && msg.id == id1, "Block called without the message"
@@ -106,6 +137,7 @@ class TestQueue < Test::Unit::TestCase
 
         # Test that message discarded when delivery mode is best_effort.
         id1 = @queue.put 'test message', :max_retries=>0, :delivery=>:best_effort
+        restart.call if restart
         begin
             @queue.get do |msg|
                 assert msg && msg.id == id1, "Block called without the message"
@@ -119,6 +151,7 @@ class TestQueue < Test::Unit::TestCase
 
         # Test that message is moved to DLQ when delivery mode is exactly_once.
         id1 = @queue.put 'test message', :max_retries=>2, :delivery=>:once
+        restart.call if restart
         begin
             @queue.get do |msg|
                 assert msg && msg.id == id1, "Block called without the message"
@@ -134,10 +167,14 @@ class TestQueue < Test::Unit::TestCase
     end
 
 private
-    def clear
+    def clear complain
         # Empty test queue and DLQ.
-        while @queue.get ; end
-        while @dlq.get ; end
+        while @queue.get
+            flunk "Found message in queue during clear" if complain
+        end
+        while @dlq.get
+            flunk "Found message in DLQ queue during clear" if complain
+        end
     end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: reliable-msg
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-11-10 00:00:00 -08:00
+  version: 1.0.1
+date: 2005-11-11 00:00:00 -08:00
 summary: Reliable messaging and persistent queues for building asynchronous applications in Ruby
 require_paths: 
 - lib