applicaster-logger 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc69922a49379e0c1a0bbd5e9be11e23c64addcd
-  data.tar.gz: 59da5c8c4b595384cccfbcafdc7da227fe493598
+  metadata.gz: 06c6c1df0cbe151f198baae8771aa4de6a877c95
+  data.tar.gz: '0912c5d269e5e11ffc7326ec37aca0d7bdd38e1a'
 SHA512:
-  metadata.gz: 4ccecea471225a37f88924369d974112e3f0fd91e2c190b439e9c915eb4ea048d9c10a297356cd1c7d74f0dee9472038ff6b08576e2b3c2e811dd65a4cecd17b
-  data.tar.gz: f2c1fa38d22ddca0f3f1782eda2ed619de07f7eb158510042d3eb3768b5a88353315aefafd1407c57fea44df5fbce19f1cae2dfa4abe5951c7feaa0dd00b7a8d
+  metadata.gz: e4cedea62aaf6ecdbe55f148e5a4020c9fad52485afad5fdd860176911c3e1c0465595a3d17041f6a00dbbbb9066b2d66dad9f850458ace5a5d0f01bb1cd7823
+  data.tar.gz: b2cb47a65c1e3b3877cad7bac8afde10d29835536f9e8a9c2d33b37e3cd6bac71260baa07daedf1848a0e99ee5d23b8cfc46e6d91305b2e1c9666ff69c16a407

data/lib/applicaster/logger/railtie.rb

@@ -6,18 +6,20 @@ require_relative "./lograge/formatter"
 module Applicaster
   module Logger
     class Railtie < Rails::Railtie
-      DEFAULT_APP_NAME = Rails.application.class.parent.to_s.underscore
+      DEFAULT_APP_NAME = proc { Rails.application.class.parent.to_s.underscore }
 
       # taken from https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/log_subscriber.rb
       INTERNAL_PARAMS = %w(controller action format only_path)
 
-      config.applicaster_logger = ActiveSupport::OrderedOptions.new.tap do |config|
-        uri = ENV["LOGSTASH_URI"]
-        config.enabled = uri.present?
-        config.level = ::Logger::INFO
-        config.application_name = ENV.fetch("LOG_APP_NAME") { DEFAULT_APP_NAME }
-        config.logstash_config = uri.present? ? { uri: uri } : { type: :stdout }
-        config.logzio_token = ENV['LOGZIO_TOKEN'].presence
+      ActiveSupport.on_load(:before_configuration) do
+        config.applicaster_logger = ActiveSupport::OrderedOptions.new.tap do |config|
+          uri = ENV["LOGSTASH_URI"]
+          config.enabled = uri.present?
+          config.level = ::Logger::INFO
+          config.application_name = ENV.fetch("LOG_APP_NAME", &DEFAULT_APP_NAME)
+          config.logstash_config = uri.present? ? Railtie.uri_logstash_config(uri) : { type: :stdout }
+          config.logzio_token = ENV['LOGZIO_TOKEN'].presence
+        end
       end
 
       initializer :applicaster_logger_rack do |app|
@@ -33,6 +35,14 @@ module Applicaster
         setup_logger(app) if app.config.applicaster_logger.enabled
       end
 
+      def self.uri_logstash_config(uri)
+        parsed = ::URI.parse(uri)
+        # params parsing can be removed if this is merged:
+        # https://github.com/dwbutler/logstash-logger/pull/148
+        params = Hash[CGI.parse(parsed.query.to_s).map {|k,v| [k,v.first]}]
+        { uri: uri, buffer_max_items: Integer(params["buffer_max_items"] || 1000)}
+      end
+
       def setup_lograge(app)
         app.config.lograge.enabled = true
         app.config.lograge.formatter = Applicaster::Logger::Lograge::Formatter.new

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Vitaly Gorodetsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger