mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Use more appropriate variable name
This commit is contained in:
parent
89f37432de
commit
82cdefd886
1 changed files with 2 additions and 2 deletions
|
@ -69,10 +69,10 @@ module Puma
|
||||||
class Configuration
|
class Configuration
|
||||||
include ConfigDefault
|
include ConfigDefault
|
||||||
|
|
||||||
def initialize(options={}, default_options = {}, &blk)
|
def initialize(user_options={}, default_options = {}, &blk)
|
||||||
default_options = self.puma_default_options.merge(default_options)
|
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
|
@plugins = PluginLoader.new
|
||||||
@user_dsl = DSL.new(@options.user_options, self)
|
@user_dsl = DSL.new(@options.user_options, self)
|
||||||
@file_dsl = DSL.new(@options.file_options, self)
|
@file_dsl = DSL.new(@options.file_options, self)
|
||||||
|
|
Loading…
Reference in a new issue