Skip to content

Commit 8114279

Browse files
committed
Track SENSIBLE_DEFAULTS usage
This feature is deprecated, let's see how many people still rely on it.
1 parent 2896b08 commit 8114279

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/language_pack/ruby.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def compile
113113
best_practice_warnings
114114
warn_outdated_ruby
115115
default_config_vars = self.class.default_config_vars(metadata: @metadata, ruby_version: @ruby_version, bundler: bundler, environment_name: environment_name)
116-
setup_profiled(ruby_layer_path: "$HOME", gem_layer_path: "$HOME", ruby_version: @ruby_version, default_config_vars: default_config_vars) # $HOME is set to /app at run time
116+
setup_profiled(ruby_layer_path: "$HOME", gem_layer_path: "$HOME", ruby_version: @ruby_version, default_config_vars: default_config_vars, report: @report) # $HOME is set to /app at run time
117117
setup_export(app_path: app_path, ruby_version: @ruby_version, default_config_vars: default_config_vars)
118118
cleanup
119119
super
@@ -339,7 +339,7 @@ def setup_export(app_path: , ruby_version: , default_config_vars: )
339339
end
340340

341341
# sets up the profile.d script for this buildpack
342-
def setup_profiled(ruby_layer_path: , gem_layer_path:, ruby_version: , default_config_vars: )
342+
def setup_profiled(ruby_layer_path: , gem_layer_path:, ruby_version: , default_config_vars: , report:)
343343
profiled_path = []
344344

345345
default_config_vars.each do |key, value|
@@ -365,6 +365,7 @@ def setup_profiled(ruby_layer_path: , gem_layer_path:, ruby_version: , default_c
365365
set_env_default "MALLOC_ARENA_MAX", "2" if default_malloc_arena_max?
366366

367367
web_concurrency = env("SENSIBLE_DEFAULTS") ? set_default_web_concurrency : ""
368+
report.capture("web_concurrency.sensible_defaults" => web_concurrency.empty?)
368369
add_to_profiled(web_concurrency, filename: "WEB_CONCURRENCY.sh", mode: "w") # always write that file, even if its empty (meaning no defaults apply), for interop with other buildpacks - and we overwrite the file rather than appending (which is the default)
369370

370371
# TODO handle JRUBY

lib/language_pack/test/ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def compile
1515
install_binaries
1616
prepare_tests
1717
default_config_vars = self.class.default_config_vars(metadata: @metadata, ruby_version: @ruby_version, bundler: bundler, environment_name: environment_name)
18-
setup_profiled(ruby_layer_path: "$HOME", gem_layer_path: "$HOME", ruby_version: @ruby_version, default_config_vars: default_config_vars) # $HOME is set to /app at run time
18+
setup_profiled(ruby_layer_path: "$HOME", gem_layer_path: "$HOME", ruby_version: @ruby_version, default_config_vars: default_config_vars, report: @report) # $HOME is set to /app at run time
1919
setup_export(app_path: app_path, ruby_version: @ruby_version, default_config_vars: default_config_vars)
2020
super
2121
end

0 commit comments

Comments
 (0)