lobster 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lobster (0.2.2)
+    lobster (0.2.4)
       daemons (>= 1.1.4)
 
 GEM

data/README.md

@@ -33,6 +33,14 @@ job "my-job" do
 end
 ~~~~~
 
+Additional settings:
+
+- `directory` this is set to `LOBSTER_DIR` by default
+- `user` the Unix user that will run the job, lobster must have full 
+  passwordless sudo access to this user
+- `max_duration` for monitoring, will log an error if the job has not been 
+  successful for `max_duration + delay` minutes
+
 ### Run Lobster
 
 Two environment variables are used (with defaults):

data/lib/lobster/job.rb

@@ -2,6 +2,8 @@ module Lobster
   class Job
     attr_accessor :next_run
 
+    OPTIONS = [:command, :delay, :max_duration, :user, :directory]
+
     def initialize(name)
       @name = name
       Lobster.logger.info "Job #{name} created."
@@ -10,9 +12,10 @@ module Lobster
 
     def reload(options, lobster_dir)
       options[:delay] ||= 10
+      options[:max_duration] ||= 0
       options[:directory] ||= lobster_dir
 
-      [:command, :delay, :user, :directory].each do |opt|
+      OPTIONS.each do |opt|
         val = instance_variable_get "@#{opt}"
         if options[opt] != val
           Lobster.logger.info "Job #{opt} updated for #{@name}, was \"#{val}\", now \"#{options[opt]}\"" if val
@@ -24,12 +27,25 @@ module Lobster
       
       @name ||= "<unnamed_job_#{@command.hash.abs}>"
       @next_run ||= Time.now + rand(@delay*60)
+      @last_run ||= Time.now
+    end
+
+    def check_last_run
+      if @max_duration > 0 and Time.now - @last_run >= (@max_duration + @delay)*60
+        Lobster.logger.error(
+          "Job #{@name} has not run since #{@last_run}"
+        )
+      end
     end
 
     def running?
       return false if @pid.nil?
       if Process.wait @pid, Process::WNOHANG
-        Lobster.logger.error "Job #{@name} Failed with status #{$?}" unless $?.success?
+        if $?.success?
+          @last_run = Time.now
+        else
+          Lobster.logger.error "Job #{@name} Failed with status #{$?}"
+        end
         @pid = nil
         @next_run = Time.now + @delay*60
         false
@@ -52,35 +68,9 @@ module Lobster
     
     def kill(sig)
       if @pid
-        Lobster.logger.info "Killing job #{@name} with pid #{@pid} and all its children"
-        kill_tree sig, @pid
-      end
-    end
-
-    private
-
-    def kill_tree(sig, pid)
-      child_parent_processes = `ps -eo pid,ppid | grep #{pid}`
-      child_parent_processes = child_parent_processes.split("\n").map do |child_and_parent|
-        child_and_parent.strip.split(/\s+/).map(&:to_i)
-      end
-      child_parent_processes.each do |child, parent|
-        if parent == pid
-          kill_tree(sig, child)
-        end
-      end
-      
-      Lobster.logger.info "Killing pid #{pid}"
-      if @user
-        `sudo -inu #{@user} -- sh -c "kill -s #{sig} #{pid}"`
-      else
-        begin
-          Process.kill sig, pid
-        rescue Errno::ESRCH
-          # Process already got killed somehow
-        rescue Exception => e
-          Lobster.logger.warn "Process #{pid} exception: #{e}"
-        end
+        Lobster.logger.info "Killing job #{@name} with pid #{@pid}"
+        Process.kill sig, @pid
+        Process.wait @pid
       end
     end
   end

data/lib/lobster/job_list.rb

@@ -30,7 +30,7 @@ module Lobster
       @current_options = nil
     end
 
-    [:command, :delay, :user, :directory].each do |opt|
+    Job::OPTIONS.each do |opt|
       define_method opt do |value|
         @current_options[opt] = value
       end

data/lib/lobster/service.rb

@@ -25,7 +25,7 @@ module Lobster
 
       Thread.new do
         while (line = rerr.gets)
-          Lobster.logger.error line.chomp
+          Lobster.logger.warn line.chomp
         end
       end
 
@@ -63,6 +63,7 @@ module Lobster
         reload_schedule
 
         @job_list.jobs.each_value do |job|
+          job.check_last_run
           if not job.running? and now >= job.next_run
             job.run(@wout, @werr)
           end

data/lib/lobster/version.rb

@@ -1,3 +1,3 @@
 module Lobster
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobster
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &77195720 !ruby/object:Gem::Requirement
+  requirement: &73730740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *77195720
+  version_requirements: *73730740
 description: ''
 email:
 - m.brugidou@criteo.com