mperham-politics 0.2.4 → 0.2.5

data/History.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 0.2.5 (2009-02-04)
+
+* Gracefully handle MemCache::MemCacheErrors.  Just sleep until memcached comes back.
+
 == 0.2.4 (2009-01-28)
 
 * Reduce leader token expiration time to discourage a get/set race condition. (Brian Dainton)

data/lib/politics/token_worker.rb

@@ -86,15 +86,22 @@ module Politics
         # If another process got there first, this is a noop.
         # We add an expiry so that the master token will constantly
         # need to be refreshed (in case the current leader dies).
-        nominate
-
         time = 0
-        if leader?
-          Politics::log.info { "#{worker_name} elected leader at #{Time.now}" }
-          # If we are the master worker, do the work.
-          time = time_for do
-            result = block.call(*args)
+        begin
+          nominate
+
+          if leader?
+            Politics::log.info { "#{worker_name} elected leader at #{Time.now}" }
+            # If we are the master worker, do the work.
+            time = time_for do
+              result = block.call(*args)
+            end
           end
+        rescue MemCache::MemCacheError => me
+          Politics::log.error("Error from memcached, pausing until the next iteration...")
+          Politics::log.error(me.message)
+          Politics::log.error(me.backtrace.join("\n"))
+          self.memcache_client.reset
         end
         
         pause_until_expiry(time)

data/test/test_helper.rb

@@ -16,4 +16,4 @@ end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require File.dirname(__FILE__) + '/../lib/init'
-#Politics::log.level = Logger::WARN
+Politics::log.level = Logger::WARN

data/test/token_worker_test.rb

@@ -34,6 +34,17 @@ class TokenWorkerTest < Test::Unit::TestCase
       end
     end
 
+    should 'handle unexpected MemCache errors' do
+      @worker.expects(:nominate)
+      @worker.expects(:leader?).raises(MemCache::MemCacheError)
+      Politics::log.expects(:error).times(3)
+
+      @worker.register_worker('testing')
+      @worker.process do
+        assert false
+      end
+    end
+
     should 'process if they are leader' do
       @worker.expects(:nominate)
       @worker.expects(:leader?).returns(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mperham-politics
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Mike Perham
@@ -9,17 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fiveruns-memcache-client
+  name: memcache-client
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0.3
+        version: 1.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: starling-starling