lobster 0.2.4 → 0.2.5.pre

data/lib/lobster/job.rb

@@ -8,6 +8,21 @@ 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)
@@ -54,12 +69,12 @@ module Lobster
       end
     end
 
-    def run(out,err)
+    def run
       Lobster.logger.info "Starting job #{@name}"
       command_line = @user ? "sudo -inu #{@user} -- sh -c 'cd #{@directory}; #{@command}'" : @command
 
       begin
-        @pid = spawn(command_line, :out=>out, :err=>err, :chdir=> @directory)
+        @pid = spawn(command_line, :out=>@wout, :err=>@werr, :chdir=> @directory)
       rescue Exception => e
         Lobster.logger.error "#{e}: error when starting job #{@name}"
         @next_run = Time.now + 10

data/lib/lobster/service.rb

@@ -14,21 +14,6 @@ module Lobster
       @config = config
       @poll_delay = 60
 
-      rout, @wout = IO.pipe
-      rerr, @werr = IO.pipe
-
-      Thread.new do
-        while (line = rout.gets)
-          Lobster.logger.info line.chomp
-        end
-      end
-
-      Thread.new do
-        while (line = rerr.gets)
-          Lobster.logger.warn line.chomp
-        end
-      end
-
       trap 'HUP' do
         begin
           @config.reload(@config[:lobster_dir], @config[:environment])
@@ -65,7 +50,7 @@ module Lobster
         @job_list.jobs.each_value do |job|
           job.check_last_run
           if not job.running? and now >= job.next_run
-            job.run(@wout, @werr)
+            job.run
           end
         end
         @sleeping = true

data/lib/lobster/version.rb

@@ -1,3 +1,3 @@
 module Lobster
-  VERSION = '0.2.4'
+  VERSION = '0.2.5.pre'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: lobster
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Maxime Brugidou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &73730740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *73730740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 description: ''
 email:
 - m.brugidou@criteo.com
@@ -59,12 +64,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple loop job runner service.