switch to disable

Author: onyxraven

README.md

@@ -129,25 +129,18 @@ Both the Rake task and standalone executable support the following
 environment variables:
 
 * `APP_NAME` - Application name used in procline (`$0`) (default empty)
-* `BACKGROUND` - [Run in the background](#running-in-the-background) if
-non-empty (via `Process.daemon`, if supported) (default `false`)
-* `DYNAMIC_SCHEDULE` - Enables [dynamic scheduling](#dynamic-schedules)
-if non-empty (default `false`)
-* `RAILS_ENV` - Environment to use in procline (`$0`) (default empty)
-* `INITIALIZER_PATH` - Path to a Ruby file that will be loaded *before*
-requiring `resque` and `resque/scheduler` (default empty).
-* `RESQUE_SCHEDULER_INTERVAL` - Interval in seconds for checking if a
-scheduled job must run (coerced with `Kernel#Float()`) (default `5`)
+* `BACKGROUND` - [Run in the background](#running-in-the-background) if non-empty (via `Process.daemon`, if supported) (default `false`)
+* `DELAYED_REQUEUE_BATCH_SIZE` - Set the delayed job batch size if enabled (default `100`). If `<= 1`, this disables batching.
+* `DISABLE_DELAYED_REQUEUE_BATCH` - Disable batched delayed job queuing (default `false`) - [See section below on consequences](#batched-delayed-job-and-resque-enqueue-hooks)
+* `DYNAMIC_SCHEDULE` - Enables [dynamic scheduling](#dynamic-schedules) if non-empty (default `false`)
+* `INITIALIZER_PATH` - Path to a Ruby file that will be loaded *before* requiring `resque` and `resque/scheduler` (default empty).
 * `LOGFILE` - Log file name (default empty, meaning `$stdout`)
-* `LOGFORMAT` - Log output format to use (either `'text'`, `'json'` or `'logfmt'`,
-default `'text'`)
+* `LOGFORMAT` - Log output format to use (either `'text'`, `'json'` or `'logfmt'`, default `'text'`)
 * `PIDFILE` - If non-empty, write process PID to file (default empty)
-* `QUIET` - Silence most output if non-empty (equivalent to a level of
-`MonoLogger::FATAL`, default `false`)
-* `VERBOSE` - Maximize log verbosity if non-empty (equivalent to a level
-of `MonoLogger::DEBUG`, default `false`)
-* `ENABLE_DELAYED_REQUEUE_BATCH` - Enable batched delayed job enqueueing per second (default `false`) - [See section below on consequences](#batched-delayed-job-and-resque-enqueue-hooks)
-* `DELAYED_REQUEUE_BATCH_SIZE` - Set the delayed job batch size if `ENABLE_DELAYED_REQUEUE_BATCH` is enabled (default `100`). If `<= 1`, this disables batching.
+* `QUIET` - Silence most output if non-empty (equivalent to a level of `MonoLogger::FATAL`, default `false`)
+* `RAILS_ENV` - Environment to use in procline (`$0`) (default empty)
+* `RESQUE_SCHEDULER_INTERVAL` - Interval in seconds for checking if a scheduled job must run (coerced with `Kernel#Float()`) (default `5`)
+* `VERBOSE` - Maximize log verbosity if non-empty (equivalent to a level of `MonoLogger::DEBUG`, default `false`)
 
 ### Resque Pool integration
 
@@ -758,8 +751,10 @@ This table explains the version requirements for rufus-scheduler
 
 ##### Batched delayed job and resque enqueue hooks
 
-Batching delayed job enqueueing can speed up when per-second job counts grows,
-avoiding situations that may cause delayed enqueues to fall behind. This batching wraps enqueues in a `multi` pipeline, making far fewer roundtrips to the server.
+Batching delayed job queuing can speed up when per-second job counts grows,
+avoiding situations that may cause delayed enqueues to fall behind. This
+batching wraps enqueues in a `multi` pipeline, making far fewer roundtrips to
+the server.
 
 However, in `redis` gem `>= 4.0`, any operations to redis within the `multi`
 block must use the multi handle so that the actions are captured. Resque's hooks

lib/resque/scheduler.rb

@@ -205,7 +205,7 @@ def enqueue_next_item(timestamp)
       end
 
       def batch_delayed_items?
-        enable_delayed_requeue_batches && delayed_requeue_batch_size > 1
+        !disable_delayed_requeue_batches && delayed_requeue_batch_size > 1
       end
 
       # Enqueues all delayed jobs for a timestamp

lib/resque/scheduler/configuration.rb

@@ -73,10 +73,10 @@ def delayed_requeue_batch_size
         @delayed_requeue_batch_size ||= 100
       end
 
-      attr_writer :enable_delayed_requeue_batches
+      attr_writer :disable_delayed_requeue_batches
 
-      def enable_delayed_requeue_batches
-        @enable_delayed_requeue_batches ||= to_bool(environment['ENABLE_DELAYED_REQUEUE_BATCH'])
+      def disable_delayed_requeue_batches
+        @enable_delayed_requeue_batches ||= to_bool(environment['DISABLE_DELAYED_REQUEUE_BATCH'])
       end
 
       # Amount of time in seconds to sleep between polls of the delayed

test/delayed_queue_test.rb

@@ -392,17 +392,17 @@ def assert_resque_key_exists?(key)
   end
 
   context "non-batch delayed item queue" do
-    batch_enabled = Resque::Scheduler.enable_delayed_requeue_batches
+    batch_disabled = Resque::Scheduler.disable_delayed_requeue_batches
     batch_size = Resque::Scheduler.delayed_requeue_batch_size
     setup do
       Resque::Scheduler.quiet = true
       Resque.data_store.redis.flushall
-      Resque::Scheduler.enable_delayed_requeue_batches = false
+      Resque::Scheduler.disable_delayed_requeue_batches = true
       Resque::Scheduler.delayed_requeue_batch_size = 1
     end
 
     teardown do
-      Resque::Scheduler.enable_delayed_requeue_batches = batch_enabled
+      Resque::Scheduler.disable_delayed_requeue_batches = batch_disabled
       Resque::Scheduler.delayed_requeue_batch_size = batch_size
     end
 
@@ -422,21 +422,21 @@ def assert_resque_key_exists?(key)
       assert_equal(90, Resque.size(Resque.queue_from_class(SomeIvarJob)))
     end
 
-    # TODO clean up timestamp?
+    # TODO clean up timestamp tests?
   end
 
   context "batch delayed item queue" do
-    batch_enabled = Resque::Scheduler.enable_delayed_requeue_batches
+    batch_disabled = Resque::Scheduler.disable_delayed_requeue_batches
     batch_size = Resque::Scheduler.delayed_requeue_batch_size
     setup do
       Resque::Scheduler.quiet = true
       Resque.data_store.redis.flushall
-      Resque::Scheduler.enable_delayed_requeue_batches = true
+      Resque::Scheduler.disable_delayed_requeue_batches = false
       Resque::Scheduler.delayed_requeue_batch_size = 100
     end
 
     teardown do
-      Resque::Scheduler.enable_delayed_requeue_batches = batch_enabled
+      Resque::Scheduler.disable_delayed_requeue_batches = batch_disabled
       Resque::Scheduler.delayed_requeue_batch_size = batch_size
     end