Respect the configured execution mode, even within the CLI (#1056)

bensheldon · Aug 30, 2023 · 1a70248 · 1a70248
1 parent 80b20fb
commit 1a70248
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/lib/good_job/configuration.rb b/lib/good_job/configuration.rb
@@ -89,21 +89,24 @@ def validate!
     # for more details on possible values.
     # @return [Symbol]
     def execution_mode
-      mode = if GoodJob::CLI.within_exe?
-               :external
-             else
-               options[:execution_mode] ||
-                 rails_config[:execution_mode] ||
-                 env['GOOD_JOB_EXECUTION_MODE']
-             end
+      mode = options[:execution_mode] ||
+             rails_config[:execution_mode] ||
+             env['GOOD_JOB_EXECUTION_MODE']
+      mode = mode.to_sym if mode
 
       if mode
-        mode.to_sym
+        if GoodJob::CLI.within_exe? && [:async, :async_server].include?(mode)
+          :external
+        else
+          mode
+        end
+      elsif GoodJob::CLI.within_exe?
+        :external
       elsif Rails.env.development?
         :async
       elsif Rails.env.test?
         :inline
-      else
+      else # rubocop:disable Lint/DuplicateBranch
         :external
       end
     end