lib/sneakers/runner.rb in sneakers-1.0.3 vs lib/sneakers/runner.rb in sneakers-1.0.4

@@ -62,11 +62,18 @@
       Sneakers.logger.info("New configuration: #{config.inspect}")
       config
     end
 
   private
-    def make_serverengine_config
+  def make_serverengine_config
+      # From Sneakers#setup_general_logger, there's support for a Logger object
+      # in CONFIG[:log].  However, serverengine takes an object in :logger.
+      # Pass our logger object so there's no issue about sometimes passing a
+      # file and sometimes an object.
+      without_log = Sneakers::CONFIG.merge(@conf)
+      without_log.delete(:log)
       Sneakers::CONFIG.merge(@conf).merge({
+        :logger => Sneakers.logger,
         :worker_type => 'process',
         :worker_classes => @worker_classes
       })
     end
   end