act-fluent-logger-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3b269dca0af21e27b94fe5fc0470ea8368f6d7
-  data.tar.gz: 1d8d7858797a83437b6af1ba5d6c434c31e41c82
+  metadata.gz: 550119ac05199783efccabc275c43ce73de465b3
+  data.tar.gz: 67e8d75dda8d2d08a5fd42f725e0c6a09bc34f6e
 SHA512:
-  metadata.gz: 9ba8d6eb2601eadb7aa8e1f0a91fcd8c9f0fd79c69832d11e66eb72a9b0284d917b6069c132978a4269b29329a0742c01cb99a331f0b6794af7aceb324acb4e7
-  data.tar.gz: a4b00ac33e2140b85f798fdd5e063124b7e31debb1a17213ba51ba68900c38a4d3ef6e5bdabf9605f3c74b415ca0dd0d939b3eb65ccdfa0fb96f4d3e353f7c08
+  metadata.gz: 3a24306a282669279ce745f47c717e81e05011caa2ff0285eb62d92e8a23fd48fcddd9829a49b4dd19e96a4f0bc969fd655b524161f89aa4f7da392c692cb2d3
+  data.tar.gz: 699d6cf7a3974d26a3c492a5885049bd322bb7c4e07f25839aa81a3434c16a907d9767e5eba9215a5d3d524e7c4d3d4f015834c8574bb728e8f98271adca0c6e

data/CHANGELOG.md

@@ -1,10 +1,14 @@
+## 0.1.9 / Dec 16 2015
+
+ * Added settings: parameter to ActFluentLoggerRails::Logger.new.
+
 ## 0.1.8 / Nov 14 2015
 
-* Output Object#inspect if message is not String and not Exception.
+ * Output Object#inspect if message is not String and not Exception.
 
 ## 0.1.7 / July 30 2015
 
-* Be able to log exceptions #15.
+ * Be able to log exceptions #15.
 
 ## 0.1.6 / March 20 2015
 

data/README.md

@@ -34,7 +34,9 @@ in config/environments/production.rb
 
 Don't use config.log_tags.
 
-create config/fluent-logger.yml
+### To define where to send messages to, either:
+
+#### create config/fluent-logger.yml
 
     development:
       fluent_host:   '127.0.0.1'
@@ -54,7 +56,7 @@ create config/fluent-logger.yml
       tag:           'foo'
       messages_type: 'string'
 
-or set an environment variable FLUENTD_URL
+#### set an environment variable FLUENTD_URL
 
     http://fluentd.example.com:42442/foo?messages_type=string
 
@@ -62,7 +64,17 @@ or set an environment variable FLUENTD_URL
  * fluent_port: The port number of Fluentd.
  * tag: The tag of the Fluentd event.
  * messages_type: The type of log messages. 'string' or 'array'.
-   If it is 'string', the log messages is a String.
+
+#### pass a settings object to ActFluentLoggerRails::Logger.new
+
+    config.logger = ActFluentLoggerRails::Logger.
+      new(settings: {
+            host: '127.0.0.1',
+	    port: 24224,
+	    tag: 'foo',
+	    messages_type: 'string'})
+
+If it is 'string', the log messages is a String.
 ```
 2013-01-18T15:04:50+09:00 foo {"messages":"Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900\nProcessing by TopController#index as HTML\nCompleted 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"level":"INFO"}
 ```
@@ -71,6 +83,7 @@ or set an environment variable FLUENTD_URL
 2013-01-18T15:04:50+09:00 foo {"messages":["Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900","Processing by TopController#index as HTML","Completed 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"level":"INFO"}
 ```
 
+
 You can add any tags at run time.
 
    logger[:foo] = "foo value"

data/lib/act-fluent-logger-rails/logger.rb

@@ -11,19 +11,21 @@ module ActFluentLoggerRails
     # Severity label for logging. (max 5 char)
     SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
 
-    def self.new(config_file: Rails.root.join("config", "fluent-logger.yml"), log_tags: {})
+    def self.new(config_file: Rails.root.join("config", "fluent-logger.yml"), log_tags: {}, settings: {})
       Rails.application.config.log_tags = [ ->(request) { request } ] unless log_tags.empty?
-      fluent_config = if ENV["FLUENTD_URL"]
-                        self.parse_url(ENV["FLUENTD_URL"])
-                      else
-                        YAML.load(ERB.new(config_file.read).result)[Rails.env]
-                      end
-      settings = {
-        tag:  fluent_config['tag'],
-        host: fluent_config['fluent_host'],
-        port: fluent_config['fluent_port'],
-        messages_type: fluent_config['messages_type'],
-      }
+      if (0 == settings.length)
+        fluent_config = if ENV["FLUENTD_URL"]
+                          self.parse_url(ENV["FLUENTD_URL"])
+                        else
+                          YAML.load(ERB.new(config_file.read).result)[Rails.env]
+                        end
+        settings = {
+          tag:  fluent_config['tag'],
+          host: fluent_config['fluent_host'],
+          port: fluent_config['fluent_port'],
+          messages_type: fluent_config['messages_type'],
+        }
+      end
       level = SEV_LABEL.index(Rails.application.config.log_level.to_s.upcase)
       logger = ActFluentLoggerRails::FluentLogger.new(settings, level, log_tags)
       logger = ActiveSupport::TaggedLogging.new(logger)

data/lib/act-fluent-logger-rails/version.rb

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec