europeana-logging 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c45b72b59da3a04c902f31739286925c72068302
-  data.tar.gz: 137fd448d51e60037acc59a985dd519b5936c4ba
+  metadata.gz: d28b719bb19c0365a3b0710aebf3034c24b40c97
+  data.tar.gz: 5e44dc017d5952ec6d80d8fd5879014702dd412e
 SHA512:
-  metadata.gz: 39fd72516044376f1bdf2ae59f543e0b6dae84bd0c0d40e9ded663fb70465a941ee948eb544c0c59f05fd3d902a169ddfb0971c268af2aca7e10f9686656a532
-  data.tar.gz: f6df585edc39903cc8a3383add97585a512128cb81c93f56458faab0394fc904e48429270b4657de30a4daac0a7eb2d6535b1549f21a08dbe876cc1ddbcc1b3e
+  metadata.gz: eedfafe46cedcf2b2de0947187239a77e7de7c8779e3a6062e561b2176f4ae884433cdcf9367c746604ccd5615dfe9e3e181759991c5a05be9d961a513699cb2
+  data.tar.gz: 490c3252fe06dbb2855a2b4803ded14750c1fe681d46d69b1b5751777782346ffc1298f0a301ac44f3c66c212c09adb97e7c7eaada4eefa80dc5453bf4dbf36c

data/app/controllers/concerns/europeana/logging/log_session_id.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Europeana
+  module Logging
+    module LogSessionId
+      extend ActiveSupport::Concern
+
+      ##
+      # Overrides `#logger` in controller to first set session via
+      # `Europeana::Logging::SessionLogging#session=`
+      def logger(*args)
+        super.session_id = session.id unless @_request.nil?
+        super(*args)
+      end
+
+      ##
+      # Lograge payload
+      def append_info_to_payload(payload)
+        super
+        payload[:session_id] = session.id
+      end
+    end
+  end
+end

data/lib/europeana/logging/engine.rb

@@ -12,8 +12,6 @@ module Europeana
 
       # Configure lograge
       initializer 'europeana_logging.configure_lograge' do |app|
-        ApplicationController.send :include, Europeana::Logging::LogragePayload
-
         app.config.lograge.custom_options = lambda do |event|
           {}.tap do |custom|
             if event.payload.key?(:redis_runtime)
@@ -29,9 +27,7 @@ module Europeana
       end
 
       # Configure Logstash
-      initializer 'europeana_logging.configure_logstash' do |app|
-        stdout_logger = LogStashLogger.new(type: :stdout)
-        app.config.logger = Rails.logger = ActionController::Base.logger = stdout_logger
+      initializer 'europeana_logging.configure_logstash' do |_app|
         LogStashLogger.configure do |config|
           config.customize_event do |event|
             event['level'] = event.remove('severity')
@@ -39,6 +35,21 @@ module Europeana
           end
         end
       end
+
+      # Init app loggers
+      initializer 'europeana_logging.set_app_loggers' do |app|
+        app.config.logger = LogStashLogger.new(type: :stdout)
+
+        Rails.logger = LogStashLogger.new(type: :stdout)
+
+        ActionController::Base.logger = LogStashLogger.new(type: :stdout)
+        ActionController::Base.logger.extend(Europeana::Logging::SessionLogging)
+      end
+
+      # Controller concern for session ID logging
+      initializer 'europeana_logging.application_controller_log_session_id' do |_app|
+        ApplicationController.send :include, Europeana::Logging::LogSessionId
+      end
     end
   end
 end

data/lib/europeana/logging/session_logging.rb

@@ -0,0 +1,16 @@
+module Europeana
+  module Logging
+    module SessionLogging
+      attr_accessor :session_id
+
+      %w(unknown fatal error warn info debug).each do |level|
+        define_method level.to_sym do |message=nil|
+          message = yield if message.nil? && block_given?
+          hmessage = message.is_a?(Hash) ? message.dup : { message: message }
+          hmessage[:session_id] = session_id
+          super(hmessage)
+        end
+      end
+    end
+  end
+end

data/lib/europeana/logging/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Europeana
   module Logging
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/europeana/logging.rb

@@ -3,5 +3,6 @@ require 'europeana/logging/engine'
 
 module Europeana
   module Logging
+    autoload :SessionLogging, 'europeana/logging/session_logging'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-logging
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,9 +82,10 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/controllers/concerns/europeana/logging/lograge_payload.rb
+- app/controllers/concerns/europeana/logging/log_session_id.rb
 - lib/europeana/logging.rb
 - lib/europeana/logging/engine.rb
+- lib/europeana/logging/session_logging.rb
 - lib/europeana/logging/version.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -115,7 +116,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -149,39 +149,38 @@ specification_version: 4
 summary: Europeana logging
 test_files:
 - test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/europeana/logging_test.rb
-- test/dummy/config.ru
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/log/test.log
-- test/dummy/public/favicon.ico
 - test/dummy/public/404.html
-- test/dummy/public/422.html
 - test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/422.html
 - test/dummy/config/locales/en.yml
+- test/dummy/config/application.rb
 - test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/application.rb
-- test/dummy/config/environment.rb
+- test/dummy/config/secrets.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/Rakefile
-- test/dummy/bin/rails
 - test/dummy/bin/rake
 - test/dummy/bin/bundle
 - test/dummy/bin/setup
+- test/dummy/bin/rails
 - test/dummy/README.rdoc
+- test/europeana/logging_test.rb
+- test/test_helper.rb

data/app/controllers/concerns/europeana/logging/lograge_payload.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-module Europeana
-  module Logging
-    module LogragePayload
-      extend ActiveSupport::Concern
-
-      def append_info_to_payload(payload)
-        super
-        payload[:session_id] = session.id
-      end
-    end
-  end
-end

data/test/dummy/log/test.log

@@ -1,6 +0,0 @@
-----------------------------------
-Europeana::LoggingTest: test_truth
-----------------------------------
-----------------------------------
-Europeana::LoggingTest: test_truth
-----------------------------------