spawn_server 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-0.0.0
+1.1.0

data/lib/spawn/server.rb

@@ -4,20 +4,56 @@ require 'spawn/task'
 module Spawn
   class Server
     POLLING_INTERVAL = 60
+    LOG_FILE = 'log/overlord.out'
 
     attr_accessor :pids
     attr_accessor :tasks
     attr_accessor :interval
     attr_accessor :start_times
 
-    def initialize(tasks, interval=POLLING_INTERVAL)
-      puts "Initializing spawn server"
+    def initialize(tasks, interval=POLLING_INTERVAL, detach=false)
+      logger.debug "Initializing spawn server"
 
       self.pids = {}
       self.start_times = {}
       self.tasks = tasks
       self.interval = interval
 
+      if detach
+        # kill any previously running instance
+        overlord_pid_file = pid_file('overlord', 1)
+        if File.file?(overlord_pid_file)
+          old_pid = File.open(overlord_pid_file).read.to_i
+          begin
+            Process.kill('HUP', old_pid)
+          rescue Exception => e
+            STDERR.puts "No such process #{old_pid}"
+          end
+        else
+          old_pid = nil
+        end
+
+        pid = Process.fork do
+          Process.setsid
+          STDIN.close
+
+          File.open(LOG_FILE, 'w') do |f|
+            STDERR.reopen f
+            STDOUT.reopen f
+          end
+
+          init_traps
+          start_tasks
+        end
+
+        File.open(overlord_pid_file,"w"){|f| f.puts pid }
+      else
+        init_traps
+        start_tasks
+      end
+    end
+
+    def init_traps
       # trap INT for debugging, in production we want to leave children active
       Signal.trap('INT') do
         process_list = self.pids.map{|k,v| "#{k} (#{v})" }.join(', ')
@@ -25,8 +61,6 @@ module Spawn
         Process.kill('INT', *self.pids.values.map{|h| h.keys }.flatten )
         exit(1)
       end
-
-      start_tasks
     end
 
     def logger
@@ -40,7 +74,7 @@ module Spawn
     end
 
     def start_tasks
-      puts self.tasks.inspect
+      logger.debug self.tasks.inspect
 
       # first load in pid files
       self.tasks.each do |id, params|
@@ -49,7 +83,7 @@ module Spawn
         params[:max_threads].times do |thread_num|
           thread_pid_file = pid_file(id, thread_num+1)
 
-          puts thread_pid_file
+          logger.debug thread_pid_file
 
           if File.exists?(thread_pid_file)
             pid = File.open(thread_pid_file).read.to_i
@@ -72,7 +106,7 @@ module Spawn
               process_stop(id, pid, false)
             end
           else
-            puts "Unrecognized value for :reload parameter in #{id}: #{params[:reload]}"
+            logger.debug "Unrecognized value for :reload parameter in #{id}: #{params[:reload]}"
           end
         end
       end
@@ -80,16 +114,16 @@ module Spawn
       loop do
         Thread.new do
           self.tasks.each do |id, params|
-            puts "Checking if #{id} is running"
+            logger.debug "Checking if #{id} is running"
 
             if (!process_running?(id, params[:max_threads]))
-              puts "It's not, starting..."
+              logger.debug "It's not, starting..."
               # not running, or not enough running, start it...
               process_start(id, params) do
                 if params[:task].is_a?(String)
                   Rake::Task[params[:task]].invoke
                 elsif params[:task].is_a?(Proc)
-                  puts "Initializing task #{id}"
+                  logger.debug "Initializing task #{id}"
                   params[:task].call
                 end
                 exit
@@ -99,9 +133,9 @@ module Spawn
             # check if the processes are running too long, this needs to be done after "process_running" is called so that the pid list is cleared, it's not optimal this way but good enough for now
             self.pids[id].each do |pid,mtime|
               if params[:max_life] && params[:max_life] < time_running(id,pid)
-                puts "Before process stop (#{pid}):\n#{process_list}"
+                logger.debug "Before process stop (#{pid}):\n#{process_list}"
                 process_stop(id,pid)
-                puts "After process stop (#{pid}):\n#{process_list}"
+                logger.debug "After process stop (#{pid}):\n#{process_list}"
 
                 # BackgroundCheck.deliver_process_max_life(id, time_running(id,pid), params[:max_life]) rescue nil
               end
@@ -172,7 +206,7 @@ module Spawn
         end
       end
 
-      puts "Stopping process #{pid} (#{id})"
+      logger.debug "Stopping process #{pid} (#{id})"
       Process.kill(9, pid) rescue nil
     end
 
@@ -184,7 +218,7 @@ module Spawn
       end
       pid = pid.handle.to_i
 
-      puts "Started process #{pid} (#{id})"
+      logger.debug "Started process #{pid} (#{id})"
       begin
         params[:max_threads].times do |thread_num|
           thread_pid_file = pid_file(id, thread_num+1)
@@ -197,7 +231,7 @@ module Spawn
         end
       rescue Exception => e
         # email this log message
-        puts e.message
+        logger.debug e.message
       end
       self.pids[id][pid] = Time.now
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spawn_server
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeff Moss