@@ -31,7 +31,7 @@ module Workling logger.debug("Discovered listener #{clazz}") @workers.add(Thread.new(clazz) { |c| clazz_listen(c) }) end - + # Wait for all workers to complete @workers.list.each { |t| t.join } @@ -44,11 +44,18 @@ module Workling # Check if all Worker threads have been started. def started? - Workling::Discovery.discovered.size == @workers.list.size + logger.debug("checking if started... list size is #{ worker_threads }") + Workling::Discovery.discovered.size == worker_threads + end + + # number of worker threads running + def worker_threads + @workers.list.size end # Gracefully stop processing def stop + logger.info("stopping threaded poller...") sleep 1 until started? # give it a chance to start up before shutting down. logger.info("Giving Listener Threads a chance to shut down. This may take a while... ") @workers.list.each { |w| w[:shutdown] = true } @@ -73,7 +80,7 @@ module Workling connection = @client_class.new connection.connect logger.info("** Starting client #{ connection.class } for #{clazz.name} queue") - + # Start dispatching those messages while (!Thread.current[:shutdown]) do begin lib/workling/remote/invokers/threaded_poller.rb @@ -21,6 +21,7 @@ context "the invoker 'threaded poller'" do client = mock() client.expects(:retrieve).at_least_once.returns("hi") + client.expects(:connect).at_least_once.returns(true) Workling::Clients::MemoryQueueClient.expects(:new).at_least_once.returns(client) # Don't take longer than 10 seconds to shut this down. test/invoker_threaded_poller_test.rb @@ -13,7 +13,7 @@ $:.unshift plugin_lib, plugin_test RAILS_ENV = "test" RAILS_ROOT = File.dirname(__FILE__) + "/.." # fake the rails root directory. RAILS_DEFAULT_LOGGER = Logger.new(STDOUT) -RAILS_DEFAULT_LOGGER.level = Logger::ERROR +RAILS_DEFAULT_LOGGER.level = Logger::WARN require "mocks/spawn" require "mocks/logger" test/test_helper.rb b46e88a66f65cdc13c3d3d6bd72c799ef5ba065d Rany Keddo rany@playtype.net http://github.com/purzelrakete/workling/commit/c3a5db984d98bddf74cb57d24b4f06d9b25943c0 c3a5db984d98bddf74cb57d24b4f06d9b25943c0 2008-11-06T15:08:07-08:00 2008-11-06T15:08:07-08:00 all tests passing again 11b8963ccb39aaaaebe9648ae626613f670a6214 Rany Keddo rany@playtype.net