torquebox-sidekiq-service 0.2.1 → 0.2.2

data/ChangeLog.md

@@ -1,3 +1,8 @@
+0.2.2 (05/28/2013)
+------------------
+
+* Use a mutex rather than a timeout for dealing with race conditions.
+
 0.2.1 (05/19/2013)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/torque_box/sidekiq_service.rb

@@ -6,23 +6,15 @@ module TorqueBox
 
     def initialize(opts = {})
       @config = opts.symbolize_keys.reject { |k, _| CONFIG_OPTIONS_TO_STRIP.include?(k) }
+      @mutex = Mutex.new
     end
 
     def start
-      Thread.new { run }
+      Thread.new { @mutex.synchronize { run } }
     end
 
     def stop
-      # Since the stop call may come before the launcher has finished starting up, try to see
-      # if the launcher ever gets initialized.  We really don't want to orphan a Sidekiq launcher
-      # if we can avoid it.
-      Timeout::timeout(5.minutes) do
-        while launcher.nil? && !start_failed
-          sleep 1
-        end
-      end
-
-      launcher.stop if launcher
+      @mutex.synchronize { launcher.stop } if launcher
     end
 
     def run

data/torquebox-sidekiq-service.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "torquebox-sidekiq-service"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Menard"]
-  s.date = "2013-05-20"
+  s.date = "2013-05-28"
   s.description = "    The TorqueBox Sidekiq service replaces the traditional Sidekiq CLI client for starting a Sidekiq processor.  This\n    allows TorqueBox features only available in-container to be usable by all your Sidekiq workers.  It has the added\n    benefit of reducing memory overhead by running in a single JVM and allows for better optimization through JIT and\n    better debugging & profiling through TorqueBox's runtime inspection facilities.\n"
   s.email = "nirvdrum@gmail.com"
   s.extra_rdoc_files = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<torquebox-sidekiq-service>, [">= 0"])
       s.add_dependency(%q<sidekiq>, [">= 0"])
@@ -61,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<torquebox-sidekiq-service>, [">= 0"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-sidekiq-service
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-sidekiq-service
@@ -155,6 +155,22 @@ dependencies:
     none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
 description: |2
       The TorqueBox Sidekiq service replaces the traditional Sidekiq CLI client for starting a Sidekiq processor.  This
       allows TorqueBox features only available in-container to be usable by all your Sidekiq workers.  It has the added