Skip to content

Commit f55a61c

Browse files
committed
Ensure passed numbers are Integer
These parameters used to be String (not enforced by types). In order to avoid changing the Unit Tests, they were kept as-is. Now that refactoring is done, switch to a better type.
1 parent 0c71629 commit f55a61c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

manifests/vhost.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@
152152
Optional[String] $passenger_user = undef,
153153
Optional[String] $passenger_group = undef,
154154
Optional[Boolean] $passenger_friendly_error_pages = undef,
155-
Optional[String] $passenger_min_instances = undef, # FIXME: Should be Integer, not String
155+
Optional[Integer] $passenger_min_instances = undef,
156156
Optional[Integer] $passenger_max_instances = undef,
157157
Optional[Integer] $passenger_max_preloader_idle_time = undef,
158158
Optional[Integer] $passenger_force_max_concurrent_requests_per_process = undef,
159-
Optional[String] $passenger_start_timeout = undef, # FIXME: Should be Integer, not String
159+
Optional[Integer] $passenger_start_timeout = undef,
160160
Optional[Enum['process', 'thread']] $passenger_concurrency_model = undef,
161161
Optional[Integer] $passenger_thread_count = undef,
162-
Optional[String] $passenger_max_requests = undef, # FIXME: Should be Integer, not String
162+
Optional[Integer] $passenger_max_requests = undef,
163163
Optional[Integer] $passenger_max_request_time = undef,
164164
Optional[Integer] $passenger_memory_limit = undef,
165165
Optional[Integer] $passenger_stat_throttle_rate = undef,

spec/defines/vhost_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,14 @@
459459
'passenger_user' => 'sandbox',
460460
'passenger_group' => 'sandbox',
461461
'passenger_friendly_error_pages' => false,
462-
'passenger_min_instances' => '1',
462+
'passenger_min_instances' => 1,
463463
'passenger_max_instances' => 30,
464464
'passenger_max_preloader_idle_time' => 600,
465465
'passenger_force_max_concurrent_requests_per_process' => 10,
466-
'passenger_start_timeout' => '600',
466+
'passenger_start_timeout' => 600,
467467
'passenger_concurrency_model' => 'thread',
468468
'passenger_thread_count' => 5,
469-
'passenger_max_requests' => '1000',
469+
'passenger_max_requests' => 1000,
470470
'passenger_max_request_time' => 2,
471471
'passenger_memory_limit' => 64,
472472
'passenger_stat_throttle_rate' => 5,

0 commit comments

Comments
 (0)