From 3ac6bc1185ec0646847a007958ab9eeffc2fadf5 Mon Sep 17 00:00:00 2001 From: Daniel Zabel Date: Wed, 15 Apr 2015 16:07:03 +0200 Subject: [PATCH 1/3] refactored logging resource to work with nexus-cli modifications --- providers/logging.rb | 12 +++++++----- resources/logging.rb | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/providers/logging.rb b/providers/logging.rb index e3705cc..f0681ca 100644 --- a/providers/logging.rb +++ b/providers/logging.rb @@ -23,7 +23,6 @@ def load_current_resource run_context.include_recipe "nexus::cli" Chef::Nexus.ensure_nexus_available(node) - @current_resource end @@ -31,7 +30,7 @@ def load_current_resource unless same_logging_level? - Chef::Nexus.nexus(node).set_logger_level(new_resource.level) + Chef::Nexus.nexus(node).set_logger_level(new_resource.name, new_resource.level) new_resource.updated_by_last_action(true) end end @@ -39,7 +38,10 @@ def load_current_resource private def same_logging_level? - require 'json' - logging_info = JSON.parse(Chef::Nexus.nexus(node).get_logging_info) - logging_info["data"]["rootLoggerLevel"] == new_resource.level + log_levels[new_resource.name] == new_resource.level end + + def log_levels + require 'json' + JSON.parse(Chef::Nexus.nexus(node).get_logging_info) + end \ No newline at end of file diff --git a/resources/logging.rb b/resources/logging.rb index 0473188..f0c50cc 100644 --- a/resources/logging.rb +++ b/resources/logging.rb @@ -21,4 +21,5 @@ actions :set_level default_action :set_level -attribute :level, :kind_of => String, :name_attribute => true, :equal_to => ["debug", "error", "info"], :default => "info" +attribute :name, :kind_of => String, :name_attribute => true +attribute :level, :kind_of => String, :equal_to => %w(trace debug info warn error off default), :default => "info" From 715f7bd58f2595e97dfd0d47fa7b9ec5691b40ed Mon Sep 17 00:00:00 2001 From: Daniel Zabel Date: Thu, 16 Apr 2015 18:38:02 +0200 Subject: [PATCH 2/3] add logging resource description and example to README --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index 9f1be57..3cc1f9a 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,33 @@ Attribute | Description | --------- |------------- |----- |-------- name | Some useful information about the license. Similar to ruby_block. | String | name +## nexus\_logging + +Resource provider for setting level for logger + +### Actions +Action | Description | Default +------- |------------- |--------- +set_level| Set logger level | Yes + +### Attributes +Attribute | Description | Type | Default +--------- |------------- |----- |-------- +name | Name of LOGGER that would be adjusted | String | name +level | Level to set for LOGGER [name] | String | info + +#### Logging Example + +Below is how you should configure logger to get information who has downloaded which artifact: + + nexus_logging "org.eclipse.jetty.server.Server" do + level "debug" + end + + nexus_logging "org.sonatype.security.internal.UserIdMdcHelper" do + level "trace" + end + ## nexus\_proxy Resource provider for manipulating the Nexus' settings for Smart Proxy. From 13dffddedc1906b90419739c6994842c1d532fa3 Mon Sep 17 00:00:00 2001 From: Daniel Zabel Date: Fri, 17 Apr 2015 12:16:31 +0200 Subject: [PATCH 3/3] fixed check for same_logging_level - use upcase value for compare --- providers/logging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/logging.rb b/providers/logging.rb index f0681ca..69a3e71 100644 --- a/providers/logging.rb +++ b/providers/logging.rb @@ -38,7 +38,7 @@ def load_current_resource private def same_logging_level? - log_levels[new_resource.name] == new_resource.level + log_levels[new_resource.name] == new_resource.level.upcase end def log_levels