From 82cdefd886cfe65f58b9096d79798e0f87a2b32d Mon Sep 17 00:00:00 2001 From: schneems Date: Mon, 6 Mar 2017 12:30:38 -0600 Subject: [PATCH] Use more appropriate variable name --- lib/puma/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puma/configuration.rb b/lib/puma/configuration.rb index 7b96ee55..4bf91556 100644 --- a/lib/puma/configuration.rb +++ b/lib/puma/configuration.rb @@ -69,10 +69,10 @@ module Puma class Configuration include ConfigDefault - def initialize(options={}, default_options = {}, &blk) + def initialize(user_options={}, default_options = {}, &blk) default_options = self.puma_default_options.merge(default_options) - @options = UserFileDefaultOptions.new(options, default_options) + @options = UserFileDefaultOptions.new(user_options, default_options) @plugins = PluginLoader.new @user_dsl = DSL.new(@options.user_options, self) @file_dsl = DSL.new(@options.file_options, self)