lib/resque/scheduler/env.rb in resque-scheduler-3.0.0 vs lib/resque/scheduler/env.rb in resque-scheduler-3.1.0

@@ -1,12 +1,15 @@
 # vim:fileencoding=utf-8
 
+require 'English' # $PROCESS_ID
+
 module Resque
   module Scheduler
     class Env
       def initialize(options)
         @options = options
+        @pidfile_path = nil
       end
 
       def setup
         require 'resque'
         require 'resque/scheduler'
@@ -14,48 +17,81 @@
         setup_backgrounding
         setup_pid_file
         setup_scheduler_configuration
       end
 
+      def cleanup
+        cleanup_pid_file
+      end
+
       private
 
-      attr_reader :options
+      attr_reader :options, :pidfile_path
 
       def setup_backgrounding
+        return unless options[:background]
+
         # Need to set this here for conditional Process.daemon redirect of
         # stderr/stdout to /dev/null
         Resque::Scheduler.quiet = !!options[:quiet]
 
-        if options[:background]
-          unless Process.respond_to?('daemon')
-            abort 'background option is set, which requires ruby >= 1.9'
-          end
-
-          Process.daemon(true, !Resque::Scheduler.quiet)
-          Resque.redis.client.reconnect
+        unless Process.respond_to?('daemon')
+          abort 'background option is set, which requires ruby >= 1.9'
         end
+
+        Process.daemon(true, !Resque::Scheduler.quiet)
+        Resque.redis.client.reconnect
       end
 
       def setup_pid_file
-        File.open(options[:pidfile], 'w') do |f|
+        return unless options[:pidfile]
+
+        @pidfile_path = File.expand_path(options[:pidfile])
+
+        File.open(pidfile_path, 'w') do |f|
           f.puts $PROCESS_ID
-        end if options[:pidfile]
+        end
+
+        at_exit { cleanup_pid_file }
       end
 
       def setup_scheduler_configuration
         Resque::Scheduler.configure do |c|
-          # These settings are somewhat redundant given the defaults present
-          # in the attr reader methods.  They are left here for clarity and
-          # to serve as an example of how to use `.configure`.
+          if options.key?(:app_name)
+            c.app_name = options[:app_name]
+          end
 
-          c.app_name = options[:app_name]
-          c.dynamic = !!options[:dynamic]
-          c.env = options[:env]
-          c.logfile = options[:logfile]
-          c.logformat = options[:logformat]
-          c.poll_sleep_amount = Float(options[:poll_sleep_amount] || '5')
-          c.verbose = !!options[:verbose]
+          if options.key?(:dynamic)
+            c.dynamic = !!options[:dynamic]
+          end
+
+          if options.key(:env)
+            c.env = options[:env]
+          end
+
+          if options.key?(:logfile)
+            c.logfile = options[:logfile]
+          end
+
+          if options.key?(:logformat)
+            c.logformat = options[:logformat]
+          end
+
+          if psleep = options[:poll_sleep_amount] && !psleep.nil?
+            c.poll_sleep_amount = Float(psleep)
+          end
+
+          if options.key?(:verbose)
+            c.verbose = !!options[:verbose]
+          end
         end
+      end
+
+      def cleanup_pid_file
+        return unless pidfile_path
+
+        File.delete(pidfile_path) if File.exist?(pidfile_path)
+        @pidfile_path = nil
       end
     end
   end
 end