Skip to content

Commit 0554b5d

Browse files
authored
Merge pull request #9108 from joshcooper/log_openssl_version
(PUP-11930) log openssl version
2 parents 8004d4c + 95ec780 commit 0554b5d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/puppet/application.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,12 @@ def log_runtime_environment(extra_info=nil)
503503
runtime_info = {
504504
'puppet_version' => Puppet.version,
505505
'ruby_version' => RUBY_VERSION,
506-
'run_mode' => self.class.run_mode.name,
506+
'run_mode' => self.class.run_mode.name
507507
}
508+
unless Puppet::Util::Platform.jruby_fips?
509+
runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"
510+
runtime_info['openssl_fips'] = OpenSSL::OPENSSL_FIPS
511+
end
508512
runtime_info['default_encoding'] = Encoding.default_external
509513
runtime_info.merge!(extra_info) unless extra_info.nil?
510514

0 commit comments

Comments
 (0)