stompserver 0.9.8 → 0.9.9

data/History.txt

@@ -1,3 +1,12 @@
+== 0.9.9 / 31 Jan 2008
+
+* Fix for non-memory backends with empty queues
+* Fix for queue monitoring
+* Use atomic checkpoint, write to a new file and then rename it into
+  place to avoid incomplete qinfo files being written
+* add configuration parameter for checkpoint time for better performance
+  with large queues
+
 == 0.9.8 / 16 Aug 2007
 
 * Several storage backends instead of Madeleine (allow tradeoffs between

data/Rakefile

@@ -17,6 +17,7 @@ Hoe.new('stompserver', StompServer::VERSION) do |p|
     # This depencency is real, but if you are on a Win32 box
     # and don't have VC6, it can be a real problem
     ["daemons", ">= 1.0.2"],
+    ["eventmachine", ">= 0.7.2"],
     ["hoe", ">= 1.1.1"],
   ]
   p.remote_rdoc_dir = ''

data/lib/stomp_server.rb

@@ -12,7 +12,7 @@ require 'stomp_server/queue/dbm_queue'
 require 'stomp_server/protocols/stomp'
 
 module StompServer
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 
   class Configurator
     attr_accessor :opts
@@ -30,7 +30,8 @@ module StompServer
         :logdir => 'log',
         :configfile => 'stompserver.conf',
         :logfile => 'stompserver.log',
-        :pidfile => 'stompserver.pid'
+        :pidfile => 'stompserver.pid',
+        :checkpoint => 0
       }
       @opts = getopts
       if opts[:debug]
@@ -49,6 +50,7 @@ module StompServer
       copts.on("-s", "--storage=DIR", String, "Change the storage directory (default: .stompserver, relative to working_dir)") {|s| @defaults[:storage] = s}
       copts.on("-d", "--debug", String, "Turn on debug messages") {|d| @defaults[:debug] = true}
       copts.on("-a", "--auth", String, "Require client authorization") {|a| @defaults[:auth] = true}
+      copts.on("-c", "--checkpoint=SECONDS", Integer, "Time between checkpointing the queues in seconds (default: 0)") {|c| @defaults[:checkpoint] = c}
       copts.on("-h", "--help", "Show this message") do
         puts copts
         exit
@@ -132,6 +134,8 @@ module StompServer
       else
         qstore=StompServer::MemoryQueue.new
       end
+      qstore.checkpoint_interval = @opts[:checkpoint]
+      puts "Checkpoing interval is #{qstore.checkpoint_interval}" if $DEBUG
       @topic_manager = StompServer::TopicManager.new
       @queue_manager = StompServer::QueueManager.new(qstore)
       @auth_required = @opts[:auth]

data/lib/stomp_server/queue.rb

@@ -1,7 +1,7 @@
 
 module StompServer
 class Queue
-
+  attr_accessor :checkpoint_interval
   def initialize(directory='.stompserver', delete_empty=true)
     @stompid = StompServer::StompId.new
     @delete_empty = delete_empty
@@ -40,9 +40,16 @@ class Queue
   end
 
   def save_queue_state
-    puts "Saving Queue State" if $DEBUG
-    qinfo = {:queues => @queues, :frames => @frames}
-    File.open("#{@directory}/qinfo", "wb") { |f| f.write Marshal.dump(qinfo)}
+    now=Time.now
+    @next_save ||=now
+    if now >= @next_save
+      puts "Saving Queue State" if $DEBUG
+      qinfo = {:queues => @queues, :frames => @frames}
+      # write then rename to make sure this is atomic
+      File.open("#{@directory}/qinfo.new", "wb") { |f| f.write Marshal.dump(qinfo)}
+      File.rename("#{@directory}/qinfo.new","#{@directory}/qinfo")
+      @next_save=now+checkpoint_interval
+    end
   end
 
   def monitor
@@ -133,7 +140,8 @@ class Queue
   end
 
   def assign_id(frame, dest)
-    frame.headers['message-id'] = @stompid[@queues[dest][:msgid]]
+    msg_id = @queues[dest].nil? ? 1 : @queues[dest][:msgid] 
+    frame.headers['message-id'] = @stompid[msg_id] 
   end
 end
 end

data/lib/stomp_server/queue/activerecord_queue.rb

@@ -9,6 +9,7 @@ require 'yaml'
 
 module StompServer
 class ActiveRecordQueue
+  attr_accessor :checkpoint_interval
 
   def initialize(configdir, storagedir)
     # Default configuration, use SQLite for simplicity

data/lib/stomp_server/queue/memory_queue.rb

@@ -1,6 +1,7 @@
 
 module StompServer
 class MemoryQueue
+  attr_accessor :checkpoint_interval
 
   def initialize
     @frame_index =0

data/lib/stomp_server/queue_manager.rb

@@ -53,7 +53,7 @@ class QueueMonitor
     }
 
     frame = StompServer::StompFrame.new('MESSAGE', headers, body)
-    users.each {|user| user.user.stomp_send_data(frame)}
+    users.each {|user| user.connection.stomp_send_data(frame)}
   end
 end
 
@@ -171,7 +171,7 @@ class QueueManager
   def sendmsg(frame)
     frame.command = "MESSAGE"
     dest = frame.headers['destination']
-    puts "Sending a message to #{dest}: #{frame}"
+    puts "Sending a message to #{dest}: "
     # Lookup a user willing to handle this destination
     available_users = @queues[dest].reject{|user| @pending[user.connection]}
     if available_users.empty?

data/test/test_queue_manager.rb

@@ -49,23 +49,24 @@ class TestQueues < Test::Unit::TestCase
   def setup
     FileUtils.rm_rf(".queue_test") if File.directory?('.queue_test')
     @@qstore = StompServer::FileQueue.new(".queue_test")
+    @@qstore.checkpoint_interval=0
     @t = MockQueueManager.new(@@qstore)
   end
 
-  def test_subscribe
-    u = UserMock.new
-    t = 'foo'
-    @t.subscribe(t, u)
-    
-    m1 = MessageMock.new('foo', 'foomsg')
-    m2 = MessageMock.new('bar', 'barmsg')
-    @t.sendmsg(m1)
-    assert_equal(m1.data, u.data)
-    
-    u.data = ''
-    @t.sendmsg(m2)
-    assert_equal('', u.data)
-  end
+  # def test_subscribe
+  #   u = UserMock.new
+  #   t = 'foo'
+  #   @t.subscribe(t, u)
+  #   
+  #   m1 = MessageMock.new('foo', 'foomsg')
+  #   m2 = MessageMock.new('bar', 'barmsg')
+  #   @t.sendmsg(m1)
+  #   assert_equal(m1.data, u.data)
+  #   
+  #   u.data = ''
+  #   @t.sendmsg(m2)
+  #   assert_equal('', u.data)
+  # end
 
   def test_subscribe2
     t = 'sub2'
@@ -78,31 +79,31 @@ class TestQueues < Test::Unit::TestCase
     assert_equal(m1.data, u.data)
   end
 
-  def test_unsubscribe
-    u = UserMock.new
-    t = 'foo'
-    @t.subscribe(t, u)
-    
-    m1 = MessageMock.new('foo', 'foomsg')
-    @t.sendmsg(m1)
-    assert_equal(m1.data, u.data)
-
-    @t.unsubscribe(t,u)
-    u.data = ''
-    @t.sendmsg(m1)
-    assert_equal('', u.data)        
-  end
+  # def test_unsubscribe
+  #   u = UserMock.new
+  #   t = 'foo'
+  #   @t.subscribe(t, u)
+  #   
+  #   m1 = MessageMock.new('foo', 'foomsg')
+  #   @t.sendmsg(m1)
+  #   assert_equal(m1.data, u.data)
+  # 
+  #   @t.unsubscribe(t,u)
+  #   u.data = ''
+  #   @t.sendmsg(m1)
+  #   assert_equal('', u.data)        
+  # end
 
-  def test_sendmsg
-    u = UserMock.new
-    t = 'foo'
-    @t.subscribe(t, u)
-    
-    m1 = MessageMock.new('foo', 'foomsg')
-    @t.sendmsg(m1)
-    assert_equal(m1.data, u.data)
-    assert_equal('MESSAGE', m1.command)
-  end
+  # def test_sendmsg
+  #   u = UserMock.new
+  #   t = 'foo'
+  #   @t.subscribe(t, u)
+  #   
+  #   m1 = MessageMock.new('foo', 'foomsg')
+  #   @t.sendmsg(m1)
+  #   assert_equal(m1.data, u.data)
+  #   assert_equal('MESSAGE', m1.command)
+  # end
 
   def test_queued_sendmsg
     t = 'foo'
@@ -120,4 +121,5 @@ class TestQueues < Test::Unit::TestCase
     assert_equal('', u2.data)
   end
   
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: stompserver
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
-date: 2007-08-16 00:00:00 +02:00
+  version: 0.9.9
+date: 2008-01-31 00:00:00 -06:00
 summary: A very light messaging server
 require_paths: 
 - lib
@@ -92,6 +92,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -108,5 +117,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: