@@ -1,7 +1,8 @@ Version 0.3.1, 15.10.08 - fixed to autodiscovery code bugs. - introduced Workling::VERSION -- fixed AR reconnecting code for Multicore systems (Thanks Brent!) +- fixed test suite for the case that no memcache client is installed at all +- fixed AR reconnecting code for Multicore systems (Thanks Brent) Version 0.3, 25.09.08 - added backgroundjob runner CHANGES.markdown @@ -21,6 +21,7 @@ module Workling @routing = routing @workers = ThreadGroup.new + @mutex = Mutex.new end # returns the Workling::Base.logger @@ -40,22 +41,28 @@ module Workling # Wait for all workers to complete @workers.list.each { |t| t.join } + logger.debug("Reaped listener threads. ") + # Clean up all the connections. ActiveRecord::Base.verify_active_connections! + logger.debug("Cleaned up connection: out!") + end + + # Check if all Worker threads have been started. + def started? + Workling::Discovery.discovered.size == @workers.list.size end - # gracefully stop processing + # Gracefully stop processing def stop + 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 } + logger.info("Listener threads were shut down. ") end - - ## - ## Thread procs - ## - + # Listen for one worker class def clazz_listen(clazz) - logger.debug("Listener thread #{clazz.name} started") # Read thread configuration if available @@ -70,7 +77,7 @@ module Workling # Setup connection to starling (one per thread) connection = Workling::Starling::Client.new - puts "** Starting Workling::Starling::Client for #{clazz.name} queue" + logger.info("** Starting Workling::Starling::Client for #{clazz.name} queue") # Start dispatching those messages while (!Thread.current[:shutdown]) do @@ -87,7 +94,7 @@ module Workling # threads would hit serious issues at this block of code without # the mutex. # - Mutex.synchronize do + @mutex.synchronize do unless ActiveRecord::Base.connection.active? # Keep MySQL connection alive unless ActiveRecord::Base.connection.reconnect! logger.fatal("Failed - Database not available!") lib/workling/starling/poller.rb @@ -13,7 +13,7 @@ ActionController::Base.logger = Workling::Base.logger poller = Workling::Starling::Poller.new(Workling::Starling::Routing::ClassAndMethodRouting.new) -trap(:INT) { exit } +trap(:INT) { poller.stop; exit } begin poller.listen script/listen.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper.rb' context "the starling poller" do setup do routing = Workling::Starling::Routing::ClassAndMethodRouting.new + # the memoryreturnstore behaves exactly like memcache. @connection = Workling::Return::Store::MemoryReturnStore.new @client = Workling::Starling::Poller.new(routing) @@ -13,4 +14,22 @@ context "the starling poller" do @connection.set("utils__echo", "hello") @client.dispatch!(@connection, Util) end + + specify "should not explode when listen is called, and stop nicely when stop is called. " do + connection = mock() + connection.expects(:active?).at_least_once.returns(true) + ActiveRecord::Base.expects(:connection).at_least_once.returns(connection) + + client = mock() + client.expects(:get).at_least_once.returns("hi") + Workling::Starling::Client.expects(:new).at_least_once.returns(client) + + # Don't take longer than 10 seconds to shut this down. + Timeout::timeout(10) do + listener = Thread.new { @client.listen } + @client.stop + listener.join + end + + end end \ No newline at end of file test/starling_poller_test.rb @@ -4,16 +4,21 @@ plugin_lib = File.join plugin_root, 'lib' require 'rubygems' require 'active_support' +require 'active_record' require 'test/spec' require 'mocha' $:.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 require "mocks/spawn" require "mocks/logger" require "workling" +require "workling/base" Workling.try_load_a_memcache_client @@ -29,9 +34,6 @@ require "workling/return/store/memory_return_store" require "workling/return/store/starling_return_store" require "mocks/client" -RAILS_ROOT = File.dirname(__FILE__) + "/.." # fake the rails root directory. -RAILS_DEFAULT_LOGGER = Logger.new - # worklings are in here. Workling.load_path ="#{ plugin_root }/test/workers" Workling::Return::Store.instance = Workling::Return::Store::MemoryReturnStore.new test/test_helper.rb @@ -4,7 +4,7 @@ module Analytics class Invites < ::Workling::Base def sent(*args) - p "nice" + logger.info("nice") end end end \ No newline at end of file test/workers/analytics/invites.rb @@ -12,4 +12,4 @@ class Util < Workling::Base def stuffing(contents) # expects contents. end -end +end \ No newline at end of file test/workers/util.rb 7328e545ccd0cd0a2f20993e08bde4c3ea7c8bc9 Rany Keddo rany@playtype.net http://github.com/purzelrakete/workling/commit/339691c131d59298042f52ae7ed85fe9e312fcad 339691c131d59298042f52ae7ed85fe9e312fcad 2008-10-17T03:13:42-07:00 2008-10-17T03:13:42-07:00 fixed problem running tests when no memcache. added mutex to connection resetting, fixed graceful shutdown of worker threads, added graceful shutdown to runner script f17dd1c7f1707a40a98742206de45fcdec257fe0 Rany Keddo rany@playtype.net