ey_snaplock 0.0.10 → 0.0.11.pre

data/lib/ey_snaplock/database/mysql.rb

@@ -7,6 +7,10 @@ module EY
         end
 
         def lock_filename
+          p '######'
+          p ENV["MYSQL_LOCK_FILENAME"]
+          p File.read(ENV["MYSQL_LOCK_FILENAME"])
+          p '$$$$$$'
           ENV["MYSQL_LOCK_FILENAME"] || "/db/mysql/.ey_snaplock.pid"
         end
 
@@ -31,7 +35,7 @@ module EY
           pipe = IO.popen(@mysql, 'w')
           @read_lock_pid = pipe.pid
           pipe.puts('flush tables with read lock;')
-          SystemTimer.timeout_after(timeout) do
+          EY::Snaplock::Timer.timeout(timeout) do
             until locked?
               sleep 1
             end

data/lib/ey_snaplock/timer.rb

@@ -0,0 +1,15 @@
+module EY
+  class Snaplock
+    class Timer
+      def self.timeout(sec)
+        if RUBY_VERSION =~ /^1\.8/
+          require 'system_timer'
+          SystemTimer.timeout_after(sec) { yield }
+        else
+          require 'timeout'
+          Timeout.timeout(sec) { yield }
+        end
+      end
+    end
+  end
+end

data/lib/ey_snaplock/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Snaplock
-    VERSION = '0.0.10'
+    VERSION = '0.0.11.pre'
   end
 end

data/lib/ey_snaplock.rb

@@ -1,7 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'ey_snaplock/database'
-require 'system_timer'
+require 'ey_snaplock/timer'
 
 module EY
   class Snaplock
@@ -52,7 +52,7 @@ module EY
     def timeout
       lambda do
         begin
-          SystemTimer.timeout_after(REQUEST_TIMEOUT) { yield }
+          EY::Snaplock::Timer.timeout(REQUEST_TIMEOUT) { yield }
         rescue Timeout::Error
           $stderr.puts "Timeout Exceeded: Callback request took longer than #{REQUEST_TIMEOUT} seconds."
           raise

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ey_snaplock
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 961916008
+  prerelease: 7
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  - pre
+  version: 0.0.11.pre
 platform: ruby
 authors: 
 - Engine Yard
@@ -15,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 -08:00
-default_executable: 
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -58,12 +58,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 11
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -140,11 +141,11 @@ files:
 - lib/ey_snaplock/database/mysql.rb
 - lib/ey_snaplock/database/postgresql9.rb
 - lib/ey_snaplock/database.rb
+- lib/ey_snaplock/timer.rb
 - lib/ey_snaplock/version.rb
 - lib/ey_snaplock.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -165,16 +166,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's snapshotting process