ignore if lock timeout is nil

Author: MouadHilali

lib/safe-pg-migrations/configuration.rb

@@ -5,16 +5,16 @@
 module SafePgMigrations
   class Configuration
     attr_accessor(*%i[
+                    backfill_batch_size
+                    backfill_pause
                     blocking_activity_logger_margin
                     blocking_activity_logger_verbose
                     default_value_backfill_threshold
-                    backfill_batch_size
-                    backfill_pause
-                    retry_delay
+                    lock_timeout
                     max_tries
                     max_lock_timeout
+                    retry_delay
                     sensitive_logger
-                    lock_timeout
                   ])
     attr_reader :safe_timeout
 

lib/safe-pg-migrations/plugins/statement_retrier.rb

@@ -21,10 +21,12 @@ def retry_if_lock_timeout
         raise if transaction_open? # Retrying is useless if we're inside a transaction.
         raise if number_of_retries >= SafePgMigrations.config.max_tries
 
-        if SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout
-          SafePgMigrations.config.lock_timeout = SafePgMigrations.config.lock_timeout * number_of_retries
-        else
-          SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout
+        unless SafePgMigrations.config.lock_timeout.nil?
+          if SafePgMigrations.config.lock_timeout < SafePgMigrations.config.max_lock_timeout
+            SafePgMigrations.config.lock_timeout = SafePgMigrations.config.lock_timeout * number_of_retries
+          else
+            SafePgMigrations.config.lock_timeout = SafePgMigrations.config.max_lock_timeout
+          end
         end
 
         retry_delay = SafePgMigrations.config.retry_delay