lib/ohai/config.rb in ohai-8.6.0.alpha.0 vs lib/ohai/config.rb in ohai-8.6.0.alpha.1

- old
+ new

@@ -15,17 +15,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # +require 'chef-config/config' require 'ohai/log' -require 'chef-config/logger' -ChefConfig::Logger = Ohai::Log - -require 'chef-config/config' - module Ohai Config = ChefConfig::Config # Reopens ChefConfig::Config to add Ohai configuration settings. # see: https://github.com/chef/chef/blob/master/lib/chef/config.rb @@ -56,11 +52,11 @@ # Keep "old" config defaults around so anyone calling Ohai::Config[:key] # won't be broken. Also allows users to append to configuration options # (e.g., Ohai::Config[:plugin_path] << some_path) in their config files. default :disabled_plugins, [] default :hints_path, default_hints_path - default :log_level, :info + default :log_level, :auto default :log_location, STDERR default :plugin_path, default_plugin_path # Log deprecation warning when a top-level configuration option is set. # TODO: Should we implement a config_attr_reader so that deprecation @@ -93,10 +89,10 @@ end config_context :ohai do default :disabled_plugins, [] default :hints_path, Ohai::Config.default_hints_path - default :log_level, :info + default :log_level, :auto default :log_location, STDERR default :plugin_path, Ohai::Config.default_plugin_path end private