stormtroopers 0.1.6 → 0.1.7

data/bin/stormtroopers

@@ -3,7 +3,7 @@
 begin
   require "config/environment"
 rescue LoadError
-  puts "Could not load environment"
+  puts "Could not load rails environment, running standalone"
 end
 
 require_relative "../lib/stormtroopers"

data/lib/stormtroopers/army.rb

@@ -27,17 +27,31 @@ module Stormtroopers
     end
 
     def need_more_troops?
-      cleanup
+      cleanup!
       threads.count < max_threads
     end
 
+    def idle?
+      cleanup!
+      threads.count == 0
+    end
+
+    def running_troopers
+      cleanup!
+      threads.map{ |thread| thread[:trooper] }.compact
+    end
+
+    def running_troopers_status
+      running_troopers.map(&:status)
+    end
+
     def run_trooper(trooper)
       threads << Thread.new do
         begin
-          trooper.run
+          Thread.current[:trooper] = trooper
+          trooper.start
         rescue Exception => exception
-          logger.error("#{exception.message}:\n#{exception.backtrace.join("\n")}")
-          trooper.exception(exception)
+          logger.error("Unexpected thread death for trooper:  #{trooper.status rescue "failed to retrieve trooper status"} : #{exception.message}:\n#{exception.backtrace.join("\n")}")
         ensure
           if defined?(::Mongoid)
             ::Mongoid::IdentityMap.clear
@@ -49,12 +63,18 @@ module Stormtroopers
       end
     end
 
+    def running_task_names
+      threads.each
+    end
+
     def finish
       logger.debug("#{name}: Finishing")
       threads.each(&:join)
     end
 
-    def cleanup
+    private
+
+    def cleanup!
       threads.reject!{ |thread| !thread.alive? }
     end
 

data/lib/stormtroopers/manager.rb

@@ -16,9 +16,14 @@ module Stormtroopers
 
       Signal.trap("INT") do
         logger.info "Stopping, waiting for running jobs to complete"
+        log_current_status
         @managing = false
       end
 
+      Signal.trap("USR2") do
+        log_current_status
+      end
+
       logger.info "Starting"
 
       if config[:speed] == "ludicrous"
@@ -40,6 +45,15 @@ module Stormtroopers
       logger.info "Stopped, all running jobs completed"
     end
 
+    def log_current_status
+      logger.info "Current status"
+      armies.each do |army|
+        army.running_troopers_status.each do |status|
+          logger.info "#{army.name}: #{status}"
+        end
+      end
+    end
+
     def managing?
       @managing || false
     end
@@ -67,9 +81,15 @@ module Stormtroopers
     end
 
     def logger
-      log_directory = File.join(working_directory, "log")
-      Dir.mkdir(log_directory) unless File.directory?(log_directory)
-      @logger ||= Logger.new(File.join(working_directory, "log", "stormtroopers.log"))
+      unless @logger 
+        log_directory = File.join(working_directory, "log")
+        Dir.mkdir(log_directory) unless File.directory?(log_directory)
+        @logger = Logger.new(File.join(working_directory, "log", "stormtroopers.log"), 'daily')
+        logger.formatter = proc do |severity, datetime, progname, msg|
+          "#{datetime.strftime("%Y-%m-%d %H:%M:%S")} #{severity}: #{msg}\n"
+        end
+      end
+      @logger
     end
 
     private

data/lib/stormtroopers/trooper/delayed_job.rb

@@ -6,6 +6,10 @@ module Stormtroopers
       @job = job
     end
 
+    def task_name
+      "#{@job.name} (#{job.id})"
+    end
+
     def run
       job.invoke_job
       job.destroy
@@ -21,7 +25,7 @@ module Stormtroopers
         job.unlock
         job.save!
       else
-        logger.error("PERMANENTLY removing #{job.name} because of #{job.attempts} consecutive failures.")
+        logger.error("PERMANENTLY removing #{job.name} (#{job.id}) because of #{job.attempts} consecutive failures.")
         job.hook(:failure)
         job.fail!
       end

data/lib/stormtroopers/trooper.rb

@@ -1,12 +1,21 @@
 module Stormtroopers
   class Trooper
-    attr_reader :task, :parameters
+    attr_reader :task, :parameters, :started_at
 
     def initialize(parameters = {}, &block)
       @parameters = parameters
       @task = block
     end
 
+    def name
+      # Override with a useful name here for logging purposes
+      @task.to_s
+    end
+
+    def status
+      "#{name} running since #{started_at.strftime("%Y-%m-%d %H:%M:%S")} (#{(Time.now - started_at).to_i} seconds)" if started_at
+    end
+
     def before_run
       # Empty hook for overriding
     end
@@ -17,17 +26,26 @@ module Stormtroopers
 
     def exception(exception)
       # Hook for to override handling exceptions
+      logger.error "Error processing #{name}: #{exception.message}"
+      logger.debug "Stacktrace #{name}:\n#{exception.backtrace.join("\n")}"
       raise exception
     end
 
     def run
-      before_run
       task.call
+    end
+
+    def start
+      @started_at = Time.now
+      before_run
+      run
       after_run
     rescue => e
       exception(e)
     end
 
+    private
+
     def logger
       Manager.logger
     end

data/lib/stormtroopers/version.rb

@@ -1,3 +1,3 @@
 module Stormtroopers
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/stormtroopers/army_spec.rb

@@ -37,14 +37,14 @@ describe Stormtroopers::Army do
       live_thread_stub = stub(:alive? => true)
       dead_thread_stub = stub(:alive? => false)
       army.stub(:threads).and_return([live_thread_stub, dead_thread_stub])
-      army.cleanup
+      army.send(:cleanup!)
       army.threads.should eq([live_thread_stub])
     end
   end
 
   describe "#manage" do
     it "cleans up" do
-      army.should_receive(:cleanup)
+      army.should_receive(:cleanup!)
       army.manage
     end
 
@@ -66,15 +66,14 @@ describe Stormtroopers::Army do
   describe "#run_trooper" do
     it "creates a new thread and runs the trooper in it" do
       trooper = mock
-      trooper.should_receive(:run)
+      trooper.should_receive(:start)
       Thread.should_receive(:new).and_yield
       army.run_trooper(trooper)
     end
 
     it "calls trooper exception hook with the exception when trooper#run raises one" do
       exception = StandardError.new
-      trooper = stub
-      trooper.stub(:run) { raise exception }
+      trooper = Stormtroopers::Trooper.new { raise exception }
       trooper.should_receive(:exception).with(exception)
       Thread.should_receive(:new).and_yield
       army.run_trooper(trooper)
@@ -82,9 +81,9 @@ describe Stormtroopers::Army do
 
     it "calls logs the exceptions at error level when trooper#run raises one" do
       exception = StandardError.new
-      trooper = stub.as_null_object
-      trooper.stub(:run) { raise exception }
-      army.logger.should_receive(:error)
+      trooper = Stormtroopers::Trooper.new { raise exception }
+      army.send(:logger).should_receive(:error)
+      army.send(:logger).should_receive(:error)
       Thread.should_receive(:new).and_yield
       army.run_trooper(trooper)
     end
@@ -98,7 +97,7 @@ describe Stormtroopers::Army do
       Mongoid.should_receive(:session).with(:default).and_return(mongoid_session)
       mongoid_session.should_receive(:disconnect)
       trooper = mock
-      trooper.should_receive(:run)
+      trooper.should_receive(:start)
       Thread.should_receive(:new).and_yield
       army.run_trooper(trooper)
     end
@@ -119,7 +118,7 @@ describe Stormtroopers::Army do
     it "takes the logger from Stormtroopers::Manager" do
       logger = stub
       Stormtroopers::Manager.stub(:logger).and_return(logger)
-      army.logger.should equal(logger)
+      army.send(:logger).should equal(logger)
     end
   end
 

data/spec/stormtroopers/manager_spec.rb

@@ -5,6 +5,7 @@ describe Stormtroopers::Manager do
 
   before(:each) {
     stub_const("Stormtroopers::Army", Class.new)
+    Stormtroopers::Manager.stub(:instance).and_return(Stormtroopers::Manager.send(:new))
   }
 
   describe "#working_directory" do
@@ -26,7 +27,7 @@ describe Stormtroopers::Manager do
   describe "#logger" do
     it "creates a logger to log/stormtroopers.log" do
       logger = stub.as_null_object
-      Logger.should_receive(:new).with(File.join(manager.working_directory, "log", "stormtroopers.log")).and_return(logger)
+      Logger.should_receive(:new).with(File.join(manager.working_directory, "log", "stormtroopers.log"), 'daily').and_return(logger)
       manager.logger.should equal(logger)
     end
   end

data/spec/stormtroopers/trooper_spec.rb

@@ -21,36 +21,36 @@ describe Stormtroopers::Trooper do
     end
   end
 
-  describe "#run" do
+  describe "#start" do
     let(:task) { lambda { puts "This is a task" } }
     let(:trooper) { Stormtroopers::Trooper.new({}, &task) }
 
     it "calls the before_run hook" do
       trooper.should_receive(:before_run)
-      trooper.run
+      trooper.start
     end
 
     it "calls call on the task" do
       task.should_receive(:call)
-      trooper.run
+      trooper.start
     end
 
     it "calls the after_run hook" do
       trooper.should_receive(:after_run)
-      trooper.run
+      trooper.start
     end
 
     it "when the task raises an exception the exception hook is called" do
       task.stub(:call) { raise "Oops" }
       trooper.should_receive(:exception)
-      trooper.run
+      trooper.start
     end
   end
 
   describe "#logger" do
     it "uses the Stormtroopers::Manager#logger" do
       trooper = Stormtroopers::Trooper.new
-      trooper.logger.should equal(Stormtroopers::Manager.logger)
+      trooper.send(:logger).should equal(Stormtroopers::Manager.logger)
     end
   end
 end

metadata

@@ -1,65 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: stormtroopers
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
+  prerelease:
 platform: ruby
 authors:
 - Andre Meij
 - Mark Kremer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: ! 'Stormtroopers is a jruby execution environment for delayed jobs '
 email:
 - andre@socialreferral.com
@@ -100,32 +104,34 @@ files:
 - vagrant-provision
 homepage: http://github.com/socialreferral/stormtroopers
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -456344668358757306
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -456344668358757306
+      version: !binary |-
+        MA==
+      hash: 2
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Execute delayed jobs in a threaded jruby environment
 test_files: