lobster 0.2.5 → 0.2.6

data/lib/lobster/job.rb

@@ -8,21 +8,6 @@ module Lobster
       @name = name
       Lobster.logger.info "Job #{name} created."
       @pid = nil
-
-      rout, @wout = IO.pipe
-      rerr, @werr = IO.pipe
-
-      Thread.new do
-        while (line = rout.gets)
-          Lobster.logger.info "#{@name}: #{line.chomp}"
-        end
-      end
-
-      Thread.new do
-        while (line = rerr.gets)
-          Lobster.logger.warn "#{@name}: #{line.chomp}"
-        end
-      end
     end
 
     def reload(options, lobster_dir)
@@ -62,6 +47,7 @@ module Lobster
           Lobster.logger.error "Job #{@name} Failed with status #{$?}"
         end
         @pid = nil
+        close_pipes
         @next_run = Time.now + @delay*60
         false
       else
@@ -70,13 +56,16 @@ module Lobster
     end
 
     def run
+      create_pipes
+
       Lobster.logger.info "Starting job #{@name}"
-      command_line = @user ? "sudo -inu #{@user} -- sh -c 'cd #{@directory}; #{@command}'" : @command
+      command_line = @user ? "sudo -nu #{@user} -- sh -lc 'cd #{@directory}; #{@command}'" : @command
 
       begin
         @pid = spawn(command_line, :out=>@wout, :err=>@werr, :chdir=> @directory)
       rescue Exception => e
         Lobster.logger.error "#{e}: error when starting job #{@name}"
+        close_pipes
         @next_run = Time.now + 10
       end
     end
@@ -92,5 +81,44 @@ module Lobster
         Process.wait @pid
       end
     end
+
+    def destroy
+      Thread.new do
+        Lobster.logger.info "Job #{name} being destroyed."
+        destroy_time = Time.now
+        while running?
+          sleep 60
+          if ((delay = Time.now - destroy_time) > 60*60)
+            Lobster.logger.warn "Job #{name} has not been destroyed after #{delay} seconds."
+          end
+        end
+      end
+    end
+
+    private
+
+    def create_pipes
+      @rout, @wout = IO.pipe
+      @rerr, @werr = IO.pipe
+
+      Thread.new do
+        while (line = @rout.gets)
+          Lobster.logger.info "#{@name}: #{line.chomp}"
+        end
+      end
+
+      Thread.new do
+        while (line = @rerr.gets)
+          Lobster.logger.warn "#{@name}: #{line.chomp}"
+        end
+      end
+    end
+
+    def close_pipes
+      @wout.close
+      @rout.close
+      @werr.close
+      @rerr.close
+    end
   end
 end

data/lib/lobster/job_list.rb

@@ -16,7 +16,7 @@ module Lobster
 
       # purely for logging
       @jobs.each do |name, job|
-        Lobster.logger.info "Job #{name} deleted." unless @new_jobs[name]
+        job.destroy unless @new_jobs[name]
       end
 
       @jobs = @new_jobs

data/lib/lobster/version.rb

@@ -1,3 +1,3 @@
 module Lobster
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobster
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons