torquebox-sidekiq-service 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - jruby-19mode
+  - jruby-head
+env:
+  - JAVA_OPTS="-server -Djruby.cext.enabled=false -Djruby.compile.invokedynamic=false"
+

data/ChangeLog.md

@@ -0,0 +1,11 @@
+0.1.1 (03/28/2013)
+------------------
+
+* Don't silently swallow errors during Sidekiq launcher startup.
+* Properly handle `stop` calls on the service when Sidekiq failed to launch.
+* Properly handle `stop` calls on the service if Sidekiq has finished launching (fixed a race condition).
+
+0.1.0 (03/13/2013)
+------------------
+
+* Initial release.

data/NOTICE

@@ -0,0 +1,2 @@
+Mogotest Jenkins Plugin
+Copyright 2013 Mogoterra, Inc.

data/README.md

@@ -4,6 +4,8 @@ TorqueBox Sidekiq Service
 This library provides a TorqueBox service for running Sidekiq inside the TorqueBox application server.  It replaces the
 Sidekiq CLI client typically used to start up TorqueBox.
 
+[![Build Status](https://secure.travis-ci.org/mogotest/torquebox-sidekiq-service.png)](http://travis-ci.org/mogotest/torquebox-sidekiq-service)
+
 Rationale
 ---------
 
@@ -21,6 +23,7 @@ There are several other reasons why a TorqueBox service may make sense for you:
 ** No need for foreman or similar tools in development
 * Easier to debug & profile by way of TorqueBox's debugging and profiling capabilities
 * Better opportunity for JVM JIT optimization
+* Faster deploys, as you don't have to wait for the Sidekiq CLI client to start and stop
 
 Of course, for every item that I think is a pro, someone else may think is a con.  Depending on perspective, some flaws
 with this approach are:
@@ -89,4 +92,4 @@ The torquebox-sidekiq-service must be loaded before you configure any Sidekiq se
 Sidekiq assumes your runtime environment is only as a client and will then ignore any server middleware configuration.
 It'll then go on to use its default server middleware, which can lead to some confusing results.  If you're on Rails,
 everything in your Gemfile will be loaded by default so you won't have anything else to do.  Otherwise, make sure you
-require the library.
+require the library.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/torque_box/sidekiq_service.rb

@@ -1,6 +1,6 @@
 module TorqueBox
   class SidekiqService
-    attr_accessor :config, :launcher
+    attr_accessor :config, :launcher, :start_failed
 
     CONFIG_OPTIONS_TO_STRIP = [:config_file, :daemon, :environment, :pidfile, :require, :tag]
 
@@ -13,7 +13,16 @@ module TorqueBox
     end
 
     def stop
-      launcher.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
     end
 
     def run
@@ -36,9 +45,15 @@ module TorqueBox
       require 'sidekiq/manager'
       require 'sidekiq/scheduled'
       require 'sidekiq/launcher'
+
       @launcher = Sidekiq::Launcher.new(Sidekiq.options)
 
       launcher.run
+    rescue => e
+      puts e.message
+      puts e.backtrace
+
+      @start_failed = true
     end
   end
-end
+end

data/torquebox-sidekiq-service.gemspec

@@ -5,20 +5,24 @@
 
 Gem::Specification.new do |s|
   s.name = "torquebox-sidekiq-service"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Menard"]
-  s.date = "2013-03-14"
+  s.date = "2013-03-29"
   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 = [
+    "ChangeLog.md",
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
+    ".travis.yml",
+    "ChangeLog.md",
     "Gemfile",
     "LICENSE.txt",
+    "NOTICE",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -42,17 +46,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sidekiq>, [">= 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"])
       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"])
     s.add_dependency(%q<sidekiq>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: torquebox-sidekiq-service
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Menard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-sidekiq-service
@@ -83,6 +83,24 @@ 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: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    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
@@ -92,11 +110,15 @@ email: nirvdrum@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- ChangeLog.md
 - LICENSE.txt
 - README.md
 files:
+- ".travis.yml"
+- ChangeLog.md
 - Gemfile
 - LICENSE.txt
+- NOTICE
 - README.md
 - Rakefile
 - VERSION