lib/sneakers/runner.rb in sneakers-0.1.1.pre vs lib/sneakers/runner.rb in sneakers-1.0.0

- old
+ new

@@ -39,11 +39,11 @@ end def reload_config! Sneakers.logger.warn("Loading runner configuration...") - config_file = Sneakers::Config[:runner_config_file] + config_file = Sneakers::CONFIG[:runner_config_file] if config_file begin instance_eval(File.read(config_file), config_file) Sneakers.logger.info("Loading config with file: #{config_file}") @@ -53,23 +53,23 @@ end config = make_serverengine_config [:before_fork, :after_fork].each do | hook | - Sneakers::Config[:hooks][hook] = config.delete(hook) if config[hook] + Sneakers::CONFIG[:hooks][hook] = config.delete(hook) if config[hook] end Sneakers.logger.info("New configuration: #{config.inspect}") config end private def make_serverengine_config - Sneakers::Config.merge(@conf).merge({ + Sneakers::CONFIG.merge(@conf).merge({ :worker_type => 'process', :worker_classes => @worker_classes }) end end - + end