diff options
| author | Marc Chamberland <mchamberland@pbsc.com> | 2019-04-23 19:00:14 -0400 |
|---|---|---|
| committer | Marc Chamberland <mchamberland@pbsc.com> | 2019-04-23 19:02:56 -0400 |
| commit | 8f51e17d6e2e6769fd70bfe75c44a84e5deb2b3b (patch) | |
| tree | 301c32f4be84ea1954810d37a06667f820a72a3f | |
| parent | 3c31c4922148d720815afe03c56083bf84c56cdf (diff) | |
| download | chef-8f51e17d6e2e6769fd70bfe75c44a84e5deb2b3b.tar.gz | |
applying requested fixes
Signed-off-by: Marc Chamberland <mchamberland@pbsc.com>
| -rw-r--r-- | lib/chef/application/windows_service.rb | 2 | ||||
| -rw-r--r-- | lib/chef/dist.rb | 4 | ||||
| -rw-r--r-- | lib/chef/http/http_request.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index b979a2a4df..6fbb1a36a2 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -131,7 +131,7 @@ class Chef break else unless run_warning_displayed - Chef::Log.info("Currently a #{Chef::Dist::GENERIC} run is happening on this system.") + Chef::Log.info("Currently a #{Chef::Dist::PRODUCT} run is happening on this system.") Chef::Log.info("Service will stop when run is completed.") run_warning_displayed = true end diff --git a/lib/chef/dist.rb b/lib/chef/dist.rb index 28c3f02afc..51dd03e965 100644 --- a/lib/chef/dist.rb +++ b/lib/chef/dist.rb @@ -1,14 +1,12 @@ class Chef class Dist + # This class is not fully implemented, depending on it is not recommended! # When referencing a product directly, like Chef (Now Chef Infra) PRODUCT = "Chef Infra".freeze # The client's alias (chef-client) CLIENT = "chef-client".freeze - # Name used for certain directories. Merge with chef_executable? - GENERIC = "chef".freeze - # The chef executable, as in `chef gem install` or `chef generate cookbook` EXEC = "chef".freeze diff --git a/lib/chef/http/http_request.rb b/lib/chef/http/http_request.rb index 7a84c07e2b..18a4648443 100644 --- a/lib/chef/http/http_request.rb +++ b/lib/chef/http/http_request.rb @@ -42,7 +42,7 @@ class Chef engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby" UA_COMMON = "/#{::Chef::VERSION} (#{engine}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}; ohai-#{Ohai::VERSION}; #{RUBY_PLATFORM}; +#{Chef::Dist::WEBSITE})".freeze - DEFAULT_UA = "#{Chef::Dist::PRODUCT} Client" << UA_COMMON + DEFAULT_UA = "Chef Client" << UA_COMMON USER_AGENT = "User-Agent".freeze |