eivo-rails 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d93be1c8da20b7729ec41134ade25b95a6d0a54f984cc66ad8db8cbd0321636
-  data.tar.gz: e52aa09657baa44657f6ef5998257c148095c4abae7c3ee4117a89d3d01d9248
+  metadata.gz: 35ce5c80a004d577ea1298d4fb342a4669eb666434f565d05c14a23448d1e3f1
+  data.tar.gz: 3d2a1c1d78622de67434d34cb255756e73defbb353e4e73a5c6b18083a958b8d
 SHA512:
-  metadata.gz: b76321ca09416e19f5acfba35cb45cac14b135c4d9263fd08e13f450b0585386de69962a1374bcdaa3ce4a25c127f759759ac329dc762d7c3e8260000bc2611f
-  data.tar.gz: 65b34ef15f79f938f5d03051e0207c2ca5c953c60d5a355eab3cc05dd3139b7025a3ccde5aa68e21f5dbf0e27a21a9576a542d298705a14c637da4d8893e98cc
+  metadata.gz: f83055dc76c1e7c943896d6a8004feeefdfd0cc2e27512521142a89d1517c9e0ce223ac54aca8e22b4f5a1634693b0f75f17b9d1c21c3a58ec43ad1e966f15e0
+  data.tar.gz: 639bba272ae7a3563f102d77d54745aa04698a8a1a1321f287e2f502eb0f4debaaf93ddb7e148c82d7b816fea552480ee30aab1d08b5d47a2f87e9b1a4445c70

data/config/initializers/logger.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'lograge'
+
+if Rails.env.staging? || Rails.env.production?
+  Rails.application.configure do
+    config.colorize_logging = false
+
+    config.lograge.enabled = true
+    config.lograge.formatter = ::Lograge::Formatters::Raw.new
+    config.lograge.base_controller_class = [
+      'ActionController::API',
+      'ActionController::Base'
+    ]
+
+    config.lograge.ignore_actions = ['EIVO::StatusController#index']
+
+    config.lograge.custom_options = ->(event) do
+      result = {
+        params: event.payload[:params].except('controller', 'action', 'format'),
+        request_id: event.payload[:request_id]
+      }
+
+      result[:user_id] = event.payload[:user_id] if event.payload[:user_id]
+      result[:organization_id] = event.payload[:organization_id] if event.payload[:organization_id]
+
+      # https://github.com/roidrage/lograge/pull/307
+      if event.respond_to?(:allocations)
+        result[:allocations] = event.allocations
+      end
+
+      result
+    end
+  end
+end

data/eivo-rails.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'eivo-rails'
-  spec.version       = '0.1.5'
+  spec.version       = '0.1.10'
   spec.authors       = ['Jonathan VUKOVICH-TRIBOUHARET']
   spec.email         = ['jonathan@eivo.co']
 
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oj'
 
   spec.add_dependency 'sentry-raven'
+  spec.add_dependency 'lograge'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/eivo-rails.rb

@@ -6,6 +6,7 @@ require 'oj'
 require 'multi_json'
 
 require_relative 'eivo-rails/engine'
+require_relative 'eivo-rails/formatter'
 
 module EIVO
   class << self

data/lib/eivo-rails/environments/production.rb

@@ -42,6 +42,7 @@ module EIVO
 
         # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
         config.force_ssl = true
+        config.ssl_options = { redirect: { exclude: -> request { request.path == '/status' } } }
 
         # Use the lowest log level to ensure availability of diagnostic information
         # when problems arise.
@@ -72,9 +73,15 @@ module EIVO
         # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
         if ENV['RAILS_LOG_TO_STDOUT'].present?
-          logger           = ActiveSupport::Logger.new(STDOUT)
+          # logger           = ActiveSupport::Logger.new(STDOUT)
+          # logger.formatter = config.log_formatter
+          # config.logger    = ActiveSupport::TaggedLogging.new(logger)
+
+          config.log_formatter = ::EIVO::Formatter.new
+          logger = ActiveSupport::Logger.new(STDOUT)
           logger.formatter = config.log_formatter
-          config.logger    = ActiveSupport::TaggedLogging.new(logger)
+          config.log_level = :info
+          config.logger = logger
         end
 
         # Do not dump schema after migrations.

data/lib/eivo-rails/formatter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'logger'
+require 'multi_json'
+
+module EIVO
+  class Formatter < ::Logger::Formatter
+    def call(severity, timestamp, progname, message)
+      json = {
+        pid: $PROCESS_ID,
+        level: severity,
+        timestamp: timestamp.utc.iso8601(3),
+        message: message
+      }
+
+      if progname
+        json[:tag] = progname
+      end
+
+      if defined?(::Sidekiq)
+        context = ::Sidekiq::Context.current
+
+        if !context.empty?
+          json[:context] = context
+        end
+      end
+
+      MultiJson.dump(json) << "\n"
+    end
+  end
+end

data/lib/generators/eivo/templates/config/puma.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-workers ENV.fetch('WEB_CONCURRENCY') { 0 }
-threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
+workers ENV.fetch('WEB_CONCURRENCY') { 0 }.to_i
+threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }.to_i
 threads threads_count, threads_count
 
 environment ENV.fetch('RAILS_ENV') { 'development' }
@@ -9,7 +9,7 @@ environment ENV.fetch('RAILS_ENV') { 'development' }
 if %w[production staging].include?(ENV['RAILS_ENV'])
   pidfile 'tmp/pids/puma.pid'
   state_path 'tmp/pids/puma.state'
-  daemonize !ENV['RAILS_DAEMONIZE'].nil?
+  daemonize ActiveModel::Type::Boolean.new.cast(ENV.fetch('RAILS_DAEMONIZE') { false })
 
   if ENV['PORT']
     bind "tcp://0.0.0.0:#{ENV['PORT']}"
@@ -17,7 +17,7 @@ if %w[production staging].include?(ENV['RAILS_ENV'])
     bind 'unix://tmp/sockets/puma.sock'
   end
 else
-  port ENV.fetch('PORT') { 3000 }
+  port ENV.fetch('PORT') { 3000 }.to_i
 end
 
 before_fork do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivo-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Jonathan VUKOVICH-TRIBOUHARET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lograge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +156,7 @@ files:
 - app/controllers/eivo/concerns/resources.rb
 - app/controllers/eivo/status_controller.rb
 - bin/eivo
+- config/initializers/logger.rb
 - config/initializers/sentry.rb
 - config/routes.rb
 - eivo-rails.gemspec
@@ -152,6 +167,7 @@ files:
 - lib/eivo-rails/environments/production.rb
 - lib/eivo-rails/environments/staging.rb
 - lib/eivo-rails/environments/test.rb
+- lib/eivo-rails/formatter.rb
 - lib/generators/eivo/USAGE
 - lib/generators/eivo/install_generator.rb
 - lib/generators/eivo/templates/.env.example
@@ -187,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: EIVO Rails