ocean-rails 1.29.5 → 1.29.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3158e42571cf6f00d22e0673c30d2d60b40612d
-  data.tar.gz: 1e0c86ded7990b0957cd3b1f2c30e7d9bd43c03d
+  metadata.gz: 097810be82ab1986758b0b6bd05520922804a791
+  data.tar.gz: 7eb017ccf1fa33788cdde74ff79697309bfc0114
 SHA512:
-  metadata.gz: d2b4c2823bf36030c272d0e8650ab15620248d34348336470cff7fa5055c5c720b043df74c71ab4c836bd38f07e43c686334e9480e91a852770345834296f65c
-  data.tar.gz: e8830b8a60562633db5a8604c2570eab91a4314db2ab5e4a54403b9325894549b12188e6138ddcd874d4c2f2cdc4b3f2dfef9c7bb4732abb9d3d05b017b0fb9b
+  metadata.gz: 66c096332ee4b2a6d3983cb7a57516ae8d6eb87af3d19b86d5424d48879e372d44e1353d59c225792ab00f4268e1a9cd152edc4ab8510dde75dcaf8c93ad81f3
+  data.tar.gz: d06c0e369c4ecb8ffc5820f02bf6b562ea624213187658044ea1bec7a83d7ca833c957fea8bf67ecbf994c32513cac64ceef99994caced189acf255417b56aaa

data/config/initializers/zeromq_logger.rb

@@ -1,5 +1,111 @@
 if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
 
+  def remove_existing_log_subscriptions
+    ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+      case subscriber
+      when ActionView::LogSubscriber
+        unsubscribe(:action_view, subscriber)
+      when ActionController::LogSubscriber
+        unsubscribe(:action_controller, subscriber)
+      end
+    end
+  end
+
+  def unsubscribe(component, subscriber)
+    events = subscriber.public_methods(false).reject{ |method| method.to_s == 'call' }
+    events.each do |event|
+      ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
+        if listener.instance_variable_get('@delegate') == subscriber
+          ActiveSupport::Notifications.unsubscribe listener
+        end
+      end
+    end
+  end
+
+  remove_existing_log_subscriptions
+
+
+  ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
+    data = args.extract_options!
+    Thread.current[:filter] = data[:filter]
+  end
+
+
+  INTERNAL_PARAMS = %w(controller action format _method only_path)
+
+  ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, started, finished, unique_id, payload|
+    path = payload[:path]
+    if path  != '/alive'
+
+      runtime = finished - started
+      param_method = payload[:params]['_method']
+      method = param_method ? param_method.upcase : payload[:method]
+      status = compute_status(payload)
+      params = payload[:params].except(*INTERNAL_PARAMS)
+
+      data = {
+        timestamp:    (started.utc.to_f * 1000).to_i,
+        method:       method,
+        status:       status,
+        runtime:      (runtime * 1000).round(0),
+        view_runtime: payload[:view_runtime].round(0),
+        db_runtime:   payload[:db_runtime].round(0)
+      }
+      data[:params] = params if params.present?
+      data[:filter] = Thread.current[:filter] if Thread.current[:filter]
+
+      Thread.current[:logdata] = data
+    end
+  end
+
+  def compute_status payload
+    status = payload[:status]
+    if status.nil? && payload[:exception].present?
+      exception_class_name = payload[:exception].first
+      status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
+    end
+    status
+  end
+
+
+  ActiveSupport::Notifications.subscribe 'request.action_dispatch' do |*args|
+    x = args.extract_options!
+    request = x[:request]
+
+    data = Thread.current[:logdata] || {}
+    data[:remote_ip] = request.remote_ip
+    data[:path] = request.filtered_path
+
+    if (ac = request.env["action_controller.instance"]) && 
+       (response = ac.response) && 
+       (body = response.body) &&
+       body.present? && 
+       body =~ /\A\{"_api_error"/
+      data[:_api_error] = JSON.parse(body)['_api_error']
+    end
+
+    ex = request.env["action_dispatch.exception"]
+    if ex 
+      if data[:status] == 404
+        data[:path] = request.env["REQUEST_PATH"]
+      else
+        # We might want to send an email here - exceptions in production
+        # should be taken seriously
+        data[:exception_message] = ex.message
+        data[:exception_backtrace] = ex.backtrace.to_json
+      end
+    end
+
+    if data[:status] >= 500
+      Rails.logger.fatal data
+    elsif data[:status] >= 400
+      Rails.logger.error data
+    else
+      Rails.logger.info data
+    end
+  end
+
+
   # Announce us
   Rails.logger.info "Initialising Rails process"
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.29.5"
+  VERSION = "1.29.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.29.5
+  version: 1.29.6
 platform: ruby
 authors:
 - Peter Bengtson
@@ -252,7 +252,6 @@ files:
 - config/initializers/api_constants.rb
 - config/initializers/aws_constants.rb
 - config/initializers/ocean_constants.rb
-- config/initializers/one_line_logging.rb
 - config/initializers/zeromq_logger.rb
 - config/routes.rb
 - lib/generators/ocean_scaffold/USAGE

data/config/initializers/one_line_logging.rb

@@ -1,107 +0,0 @@
-exit unless Rails.env == 'production'
-
-def remove_existing_log_subscriptions
-  ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
-    case subscriber
-    when ActionView::LogSubscriber
-      unsubscribe(:action_view, subscriber)
-    when ActionController::LogSubscriber
-      unsubscribe(:action_controller, subscriber)
-    end
-  end
-end
-
-def unsubscribe(component, subscriber)
-  events = subscriber.public_methods(false).reject{ |method| method.to_s == 'call' }
-  events.each do |event|
-    ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
-      if listener.instance_variable_get('@delegate') == subscriber
-        ActiveSupport::Notifications.unsubscribe listener
-      end
-    end
-  end
-end
-
-remove_existing_log_subscriptions
-
-
-ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
-  data = args.extract_options!
-  Thread.current[:filter] = data[:filter]
-end
-
-
-INTERNAL_PARAMS = %w(controller action format _method only_path)
-
-ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, started, finished, unique_id, payload|
-  path = payload[:path]
-  if path  != '/alive'
-
-    runtime = finished - started
-    param_method = payload[:params]['_method']
-    method = param_method ? param_method.upcase : payload[:method]
-    status = compute_status(payload)
-    params = payload[:params].except(*INTERNAL_PARAMS)
-
-    data = {
-      timestamp:    (started.utc.to_f * 1000).to_i,
-      method:       method,
-      status:       status,
-      runtime:      (runtime * 1000).round(0),
-      view_runtime: payload[:view_runtime].round(0),
-      db_runtime:   payload[:db_runtime].round(0)
-    }
-    data[:params] = params if params.present?
-    data[:filter] = Thread.current[:filter] if Thread.current[:filter]
-
-    Thread.current[:logdata] = data
-  end
-end
-
-def compute_status payload
-  status = payload[:status]
-  if status.nil? && payload[:exception].present?
-    exception_class_name = payload[:exception].first
-    status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
-  end
-  status
-end
-
-
-ActiveSupport::Notifications.subscribe 'request.action_dispatch' do |*args|
-  x = args.extract_options!
-  request = x[:request]
-
-  data = Thread.current[:logdata] || {}
-  data[:remote_ip] = request.remote_ip
-  data[:path] = request.filtered_path
-
-  if (ac = request.env["action_controller.instance"]) && 
-     (response = ac.response) && 
-     (body = response.body) &&
-     body.present? && 
-     body =~ /\A\{"_api_error"/
-    data[:_api_error] = JSON.parse(body)['_api_error']
-  end
-
-  ex = request.env["action_dispatch.exception"]
-  if ex 
-    if data[:status] == 404
-      data[:path] = request.env["REQUEST_PATH"]
-    else
-      # We might want to send an email here - exceptions in production
-      # should be taken seriously
-      data[:exception_message] = ex.message
-      data[:exception_backtrace] = ex.backtrace.to_json
-    end
-  end
-
-  if data[:status] >= 500
-    Rails.logger.fatal data
-  elsif data[:status] >= 400
-    Rails.logger.error data
-  else
-    Rails.logger.info data
-  end
-end
-