remix-stash 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/remix/stash/auto_detection.rb

@@ -1,5 +1,5 @@
 if defined?(Rails)
-  stash.default(:logger => Rails.logger)
+  Remix::Stash::Runtime.logger = Rails.logger
 
   module Remix::Stash::RailsSupport
   private
@@ -25,3 +25,8 @@ if defined?(Rails)
   end
 
 end
+
+unless Remix::Stash::Runtime.logger
+  require 'logger'
+  Remix::Stash::Runtime.logger = Logger.new(STDERR)
+end

data/lib/remix/stash/cluster.rb

@@ -4,6 +4,7 @@ require 'digest/md5'
 class Remix::Stash::Cluster
   include Enumerable
   include Socket::Constants
+  include Remix::Stash::Runtime
 
   @@connections = {}
 
@@ -24,7 +25,12 @@ class Remix::Stash::Cluster
       rescue Errno::EPIPE, Errno::ECONNRESET, Remix::Stash::ProtocolError
         io.close
         retry
-      rescue Errno::EAGAIN, Errno::ECONNREFUSED
+      rescue Errno::EAGAIN
+        logger.error("[stash] Cluster socket timeout on #{@hosts[(hash + try) % count][0]}")
+        io.close
+        next
+      rescue Errno::ECONNREFUSED
+        logger.error("[stash] Cluster connection refused on #{@hosts[(hash + try) % count][0]}")
         next
       end
     end
@@ -48,7 +54,12 @@ class Remix::Stash::Cluster
       rescue Errno::EPIPE, Errno::ECONNRESET, Remix::Stash::ProtocolError
         io.close
         retry
-      rescue Errno::EAGAIN, Errno::ECONNREFUSED
+      rescue Errno::EAGAIN
+        logger.error("[stash] Cluster socket timeout on #{@hosts[(hash + try) % count][0]}")
+        io.close
+        next
+      rescue Errno::ECONNREFUSED
+        logger.error("[stash] Cluster connection refused on #{@hosts[(hash + try) % count][0]}")
         next
       end
     end

data/lib/remix/stash/runtime.rb

@@ -0,0 +1,13 @@
+module Remix::Stash::Runtime
+  extend self
+
+  @@logger = nil
+  def logger
+    @@logger
+  end
+
+  def logger=(log)
+    @@logger = log
+  end
+
+end

data/lib/remix/stash.rb

@@ -1,10 +1,13 @@
 module Remix; end
 
 class Remix::Stash
+  require 'remix/stash/runtime'
   require 'remix/stash/extension'
   require 'remix/stash/cluster'
   require 'remix/stash/protocol'
 
+  include Runtime
+
   attr_accessor :name
 
   @@instances = {}
@@ -100,7 +103,7 @@ class Remix::Stash
     cluster(opts).select(key) {|io|
       value = Protocol.get(io, key)
       if value
-        Marshal.load(value)
+        load_value(value)
       else
         value = yield(*keys)
         Protocol.set(io, key, dump_value(value), opts[:ttl])
@@ -279,8 +282,7 @@ private
       rescue Exception
       end
     end
-    logger = default_opts[:logger]
-    logger && logger.error("[stash] Unable to load marshal stream: #{data.inspect}")
+    logger.error("[stash] Unable to load marshal stream: #{data.inspect}")
     nil
   end
 

data/remix-stash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remix-stash}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Mitchell"]
-  s.date = %q{2009-10-03}
+  s.date = %q{2009-10-06}
   s.email = %q{binary42@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -36,12 +36,14 @@ Gem::Specification.new do |s|
      "lib/remix/stash/cluster.rb",
      "lib/remix/stash/extension.rb",
      "lib/remix/stash/protocol.rb",
+     "lib/remix/stash/runtime.rb",
      "remix-stash.gemspec",
      "spec/auto_detection_spec.rb",
      "spec/extension_spec.rb",
      "spec/spec.rb",
      "spec/stash_spec.rb",
      "spec/support/bar.rb",
+     "spec/support/rails/.gitignore",
      "spec/support/rails/README",
      "spec/support/rails/Rakefile",
      "spec/support/rails/app/controllers/application_controller.rb",
@@ -61,10 +63,6 @@ Gem::Specification.new do |s|
      "spec/support/rails/config/routes.rb",
      "spec/support/rails/db/seeds.rb",
      "spec/support/rails/doc/README_FOR_APP",
-     "spec/support/rails/log/development.log",
-     "spec/support/rails/log/production.log",
-     "spec/support/rails/log/server.log",
-     "spec/support/rails/log/test.log",
      "spec/support/rails/public/404.html",
      "spec/support/rails/public/422.html",
      "spec/support/rails/public/500.html",

data/spec/auto_detection_spec.rb

@@ -5,7 +5,7 @@ class AutoDetectionSpec < Spec
   context 'Rails' do
 
     should 'link the logger object' do
-      assert_equal Rails.logger, stash.default[:logger]
+      assert_equal Rails.logger, Remix::Stash::Runtime.logger
     end
 
     should 'link cycle_action to an after filter' do

data/spec/support/rails/.gitignore

@@ -0,0 +1 @@
+log/*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remix-stash
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brian Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -04:00
+date: 2009-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -43,12 +43,14 @@ files:
 - lib/remix/stash/cluster.rb
 - lib/remix/stash/extension.rb
 - lib/remix/stash/protocol.rb
+- lib/remix/stash/runtime.rb
 - remix-stash.gemspec
 - spec/auto_detection_spec.rb
 - spec/extension_spec.rb
 - spec/spec.rb
 - spec/stash_spec.rb
 - spec/support/bar.rb
+- spec/support/rails/.gitignore
 - spec/support/rails/README
 - spec/support/rails/Rakefile
 - spec/support/rails/app/controllers/application_controller.rb
@@ -68,10 +70,6 @@ files:
 - spec/support/rails/config/routes.rb
 - spec/support/rails/db/seeds.rb
 - spec/support/rails/doc/README_FOR_APP
-- spec/support/rails/log/development.log
-- spec/support/rails/log/production.log
-- spec/support/rails/log/server.log
-- spec/support/rails/log/test.log
 - spec/support/rails/public/404.html
 - spec/support/rails/public/422.html
 - spec/support/rails/public/500.html