leafy-logger 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb1b3ecc2a5c3c68c5404d5f9700725d781d2df
-  data.tar.gz: 1410c3e6942ae9320af895fb9de2c2bb70d61483
+  metadata.gz: 1edaf8d266b154d77138726bca83c4f088e6ba5c
+  data.tar.gz: 76fc9235ef72622badaa6b960bcf22963a54ac93
 SHA512:
-  metadata.gz: 9ed23422d8fc080194cf5eea536708a9f01846cfa3e8d064d566ee2e98ee587156b01376d9950c64b59347ae95358375cf06b81de928678c5da110d50751ebae
-  data.tar.gz: 702de8a2429274722894c946eac8a1f88f58200dc314632bf062a59456b36ade2bc9a92c3bebf7db11f6baa27099a0f23effc1d3d66f425d05631e8c257012b1
+  metadata.gz: 2b306aa5c14cb9c2f100954926cce76e99870abcb83b0bf510ad414aef34877588779ea6d094f0ac118889e54ec17cfa9e6402ff805cbedfc31b802eb3181c3c
+  data.tar.gz: d2cc30bf437d1d6d75e57b54742833815ef1005045e45ee9b0ef6472c2fe6a096ccdc3fa88c069a5d3e381f65973db9f5f6457fed12e3858d2069733318393b4

data/.gitignore

@@ -2,3 +2,4 @@
 doc
 pkg
 *.lock
+logs

data/README.md

@@ -104,6 +104,58 @@ appender = Leafy::Logger::SyslogAppenderFactory.new do
 end
 ```
 
+# using configurations
+
+a yaml file or an options hash can be used to configure the logger factory. once you have a logger factory you can reconfigure it with a yaml-file or options hash at runtime.
+
+## build logger factory from yaml file
+
+having a yaml file like (config/logging.yaml)
+
+```
+level: ERROR
+loggers:
+  com.example.app: DEBUG
+  com.example.db: INFO
+appenders:
+  - type: console
+    threshold: DEBUG
+    target: STDERR
+  - type: file
+    threshold: INFO
+    currentLogFilename: ./logs/example.log
+    archivedLogFilenamePattern: ./logs/example-%d.log.gz
+    archivedFileCount: 12
+  - type: syslog
+    host: 127.0.0.1
+    port: 123
+    facility: KERN
+```
+can be used to build ```LoggerFactory``` directly from this yaml file:
+
+```
+factory = Leafy::Logger::Factory.new_from_yaml( 'config/logging.yaml' )
+```
+
+having the same config as ```Hash``` can be used as well
+
+```
+options = YAML.load( File.read( 'config/logging.yaml' ) )
+factory = Leafy::Logger::Factory.new_from_options( options )
+```
+
+## reconfigure logger factory at runtime
+
+```
+factory.reconfigure_from_yaml( 'config/logging.yaml' )
+```
+
+or
+
+```
+factory.reconfigure_from_options( options )
+```
+
 ## developement
 
 get all the gems and jars in place

data/lib/leafy/logger/factory.rb

@@ -2,10 +2,12 @@ require 'leafy/logger'
 require 'leafy/logger/appender_factories'
 require 'yaml'
 require 'stringio'
+require 'jruby/synchronized'
 
 module Leafy
   module Logger
     class Factory
+      include JRuby::Synchronized
 
       class HashSourceProvider
         include Java::IoDropwizardConfiguration::ConfigurationSourceProvider
@@ -33,8 +35,8 @@ module Leafy
         Java::IoDropwizardConfiguration::ConfigurationFactory.new( Java::IoDropwizardLogging::LoggingFactory.java_class, validator, objectMapper, "" )
       end
 
-      def self.new_from( hash )
-        new( configurator.build( HashSourceProvider.new( hash ), 'dummy') )
+      def self.new_from_options( options )
+        new( configurator.build( HashSourceProvider.new( options ), 'dummy') )
       end
 
       def self.new_from_yaml( yamlfile )
@@ -46,6 +48,22 @@ module Leafy
         @factory = factory || Java::IoDropwizardLogging::LoggingFactory.new
       end
 
+      def reconfigure_from_options( options )
+        do_reconfigure( self.class.configurator.build( HashSourceProvider.new( options ), 'dummy') )
+      end
+
+      def reconfigure_from_yaml( yamlfile )
+        raise "no such file #{yamlfile}" unless File.exists?( yamlfile )
+        do_reconfigure( self.class.configurator.build( java.io.File.new( yamlfile ) ) )
+      end
+
+      def do_reconfigure( factory )
+        @factory.stop
+        @factory = factory
+        reconfigure
+      end
+      private :do_reconfigure
+
       def level args = nil
         if args
           self.level = args
@@ -54,6 +72,12 @@ module Leafy
         end
       end
 
+      def level_set level
+        l = level.to_s.upcase
+        @factory.level = Java::ChQosLogbackClassic::Level.const_get( l )
+      end
+      private :level_set
+
       def level= level
         l = level.to_s.upcase
         @factory.level = Java::ChQosLogbackClassic::Level.const_get( l )
@@ -87,10 +111,15 @@ module Leafy
         self.loggers = m
       end
 
-      def loggers= map
+      def loggers_set map
         m = {}
         map.each { |k,v| m[k] = Java::ChQosLogbackClassic::Level.const_get( v.to_s.upcase ) }
         @factory.loggers = m
+      end
+      private :loggers_set
+
+      def loggers= map
+        loggers_set( map )
         reconfigure
       end
 

data/lib/leafy/logger/version.rb

@@ -1,6 +1,6 @@
 module Leafy
   module Logger
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end
 

data/spec/factory_spec.rb

@@ -17,6 +17,19 @@ describe Leafy::Logger::Factory do
   let( :logger1 ) { Leafy::Logger::Factory.get_logger 'my.app' }
   let( :logger2 ) { Leafy::Logger::Factory.get_logger 'my.db' }
 
+  let( :factory_yaml ) { Leafy::Logger::Factory.new_from_yaml( yaml ) }
+  let( :reconfigured_yaml ) do
+    subject.reconfigure_from_yaml( yaml )
+    subject
+  end
+
+  let( :options ) { YAML.load( File.read( yaml ) ) }
+  let( :factory_options ) { Leafy::Logger::Factory.new_from_options( options ) }
+  let( :reconfigured_options ) do
+    subject.reconfigure_from_options( options )
+    subject
+  end
+
   before { FileUtils.rm_f log }
   after { FileUtils.rm_f log }
 
@@ -115,41 +128,49 @@ describe Leafy::Logger::Factory do
     expect {Leafy::Logger::Factory.new_from_yaml( yaml + '.gone' ) }.to raise_error( Exception )
   end
 
-  it 'can use a yaml configuration' do
-    f = Leafy::Logger::Factory.new_from_yaml( yaml )
-    expect( f.level ).to eq 'ERROR'
-    expect( f.loggers ).to eq 'com.example.app' => 'DEBUG'
-    expect( f.appenders.size ).to eq 3
-    # console
-    expect( f.appenders[0].threshold ).to eq 'DEBUG'
-    expect( f.appenders[0].target ).to eq 'STDERR'
-    # file
-    expect( f.appenders[1].threshold ).to eq 'INFO'
-    expect( f.appenders[1].current_log_filename ).to eq './logs/example.log'
-    expect( f.appenders[1].archived_log_filename_pattern ).to eq './logs/example-%d.log.gz'
-    expect( f.appenders[1].archived_file_count ).to eq 12
-    # syslog
-    expect( f.appenders[2].host ).to eq 'myhost'
-    expect( f.appenders[2].port ).to eq 123
-    expect( f.appenders[2].facility ).to eq 'KERN'
+  it 'fails reconfigure on missing yaml configuration' do
+    expect {subject.reconfigure_from_yaml( yaml + '.gone' ) }.to raise_error( Exception )
   end
 
-  it 'can use a hash configuration' do
-    f = Leafy::Logger::Factory.new_from( YAML.load( File.read( yaml ) ) )
-    expect( f.level ).to eq 'ERROR'
-    expect( f.loggers ).to eq 'com.example.app' => 'DEBUG'
-    expect( f.appenders.size ).to eq 3
-    # console
-    expect( f.appenders[0].threshold ).to eq 'DEBUG'
-    expect( f.appenders[0].target ).to eq 'STDERR'
-    # file
-    expect( f.appenders[1].threshold ).to eq 'INFO'
-    expect( f.appenders[1].current_log_filename ).to eq './logs/example.log'
-    expect( f.appenders[1].archived_log_filename_pattern ).to eq './logs/example-%d.log.gz'
-    expect( f.appenders[1].archived_file_count ).to eq 12
-    # syslog
-    expect( f.appenders[2].host ).to eq 'myhost'
-    expect( f.appenders[2].port ).to eq 123
-    expect( f.appenders[2].facility ).to eq 'KERN'
+  [ :factory_yaml, :reconfigured_yaml ].each do |method|
+    it "can use a yaml configuration - #{method}" do
+      f = send( method )
+      expect( f.level ).to eq 'ERROR'
+      expect( f.loggers ).to eq 'com.example.app' => 'DEBUG'
+      expect( f.appenders.size ).to eq 3
+      # console
+      expect( f.appenders[0].threshold ).to eq 'DEBUG'
+      expect( f.appenders[0].target ).to eq 'STDERR'
+      # file
+      expect( f.appenders[1].threshold ).to eq 'INFO'
+      expect( f.appenders[1].current_log_filename ).to eq './logs/example.log'
+      expect( f.appenders[1].archived_log_filename_pattern ).to eq './logs/example-%d.log.gz'
+      expect( f.appenders[1].archived_file_count ).to eq 12
+      # syslog
+      expect( f.appenders[2].host ).to eq '127.0.0.1'
+      expect( f.appenders[2].port ).to eq 123
+      expect( f.appenders[2].facility ).to eq 'KERN'
+    end
+  end
+
+  [ :factory_options, :reconfigured_options ].each do |method|
+    it 'can use a hash configuration' do
+      f = send( method )
+      expect( f.level ).to eq 'ERROR'
+      expect( f.loggers ).to eq 'com.example.app' => 'DEBUG'
+      expect( f.appenders.size ).to eq 3
+      # console
+      expect( f.appenders[0].threshold ).to eq 'DEBUG'
+      expect( f.appenders[0].target ).to eq 'STDERR'
+      # file
+      expect( f.appenders[1].threshold ).to eq 'INFO'
+      expect( f.appenders[1].current_log_filename ).to eq './logs/example.log'
+      expect( f.appenders[1].archived_log_filename_pattern ).to eq './logs/example-%d.log.gz'
+      expect( f.appenders[1].archived_file_count ).to eq 12
+      # syslog
+      expect( f.appenders[2].host ).to eq '127.0.0.1'
+      expect( f.appenders[2].port ).to eq 123
+      expect( f.appenders[2].facility ).to eq 'KERN'
+    end
   end
 end

data/spec/logging.yml

@@ -11,6 +11,6 @@ appenders:
     archivedLogFilenamePattern: ./logs/example-%d.log.gz
     archivedFileCount: 12
   - type: syslog
-    host: myhost
+    host: 127.0.0.1
     port: 123
     facility: KERN

metadata

@@ -1,93 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: leafy-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - christian meier
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.8
-  name: jar-dependencies
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
+  name: leafy-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-  name: leafy-metrics
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: yard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
-description: adding logback to leafy with yaml configuration and bridges to log4j and jul
+description: adding logback to leafy with yaml configuration and bridges to log4j
+  and jul
 email:
 - christian.meier@lookout.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -107,27 +108,26 @@ homepage: https://github.com/lookout/leafy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - jar io.dropwizard:dropwizard-logging, 0.8.0-rc5, [ joda-time:joda-time ]
 - jar io.dropwizard:dropwizard-configuration, 0.8.0-rc5, [ org.yaml:snakeyaml ]
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.4.5
-signing_key:
+signing_key: 
 specification_version: 4
 summary: adding logback to leafy
 test_files: []
-has_rdoc: