Fix initialization when the Load Rails option is specified

ruby-shoryuken · Apr 20, 2016 · 654536c · 654536c
1 parent ad38827
commit 654536c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/shoryuken/environment_loader.rb b/lib/shoryuken/environment_loader.rb
@@ -15,9 +15,12 @@ def initialize(options)
     end
 
     def load
-      initialize_options
-      initialize_logger
-      load_rails if options[:rails]
+      if options[:rails]
+        load_rails
+      else
+        initialize_options
+        initialize_logger
+      end
       merge_cli_defined_queues
       prefix_active_job_queue_names
       parse_queues
@@ -98,6 +101,7 @@ def load_rails
 
       # Reload options with Rails environment (see PR #195)
       initialize_options
+      initialize_logger
 
       Shoryuken.logger.info { 'Rails environment loaded' }
     end