ocean-rails 1.29.4 → 1.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62098771fbece3d538d3fc124ab745e3b345400
-  data.tar.gz: ec0ec9a930e28e7f088098a078a1e25d3f99c129
+  metadata.gz: d3158e42571cf6f00d22e0673c30d2d60b40612d
+  data.tar.gz: 1e0c86ded7990b0957cd3b1f2c30e7d9bd43c03d
 SHA512:
-  metadata.gz: 788db4f9e35dc3d4172e4f82b16e6124e87238d605c66df55b1e5f879d0ac883218a488b6ad1bf5c7b3fb42dbae045fbfa949b10eeea66cf243d63d75f7ee90f
-  data.tar.gz: cd36f14e52ad7095afb4efa3a2206865817012af080cea1ab0b62721ead56c0d8cc88787c535576f71a9daa3b369eb580bd3ffd436de5db2f92eb76618650ef5
+  metadata.gz: d2b4c2823bf36030c272d0e8650ab15620248d34348336470cff7fa5055c5c720b043df74c71ab4c836bd38f07e43c686334e9480e91a852770345834296f65c
+  data.tar.gz: e8830b8a60562633db5a8604c2570eab91a4314db2ab5e4a54403b9325894549b12188e6138ddcd874d4c2f2cdc4b3f2dfef9c7bb4732abb9d3d05b017b0fb9b

data/config/initializers/one_line_logging.rb

@@ -0,0 +1,107 @@
+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
+

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -95,12 +95,4 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
                     "Rails.logger = ZeromqLogger.new\n\n"
   end
 
-  def turn_off_view_logging_in_production
-    application(nil, env: "production") do
-      "# We don't want to see view render lines in production.
-       config.action_view.logger = nil
-       "
-    end
-  end
-
 end

data/lib/ocean/selective_rack_logger.rb

@@ -38,7 +38,6 @@ class SelectiveRackLogger < Rails::Rack::Logger
 
     instrumenter = ActiveSupport::Notifications.instrumenter
     instrumenter.start 'request.action_dispatch', request: request
-    #logger.info started_request_message(request)
     resp = @app.call(env)
     resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
     resp

data/lib/ocean/version.rb

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

data/lib/ocean/zeromq_logger.rb

@@ -75,15 +75,14 @@ class ZeromqLogger
   def add(level, msg)
     return true if level < @level
     return true if msg.blank?       # Don't send
-    #puts "Adding #{level} #{msg}"
-    milliseconds = (Time.now.utc.to_f * 1000).to_i
-    data = { timestamp: milliseconds,
-             ip:        @ip,
+    data = { ip:        @ip,
              pid:       Process.pid,
              service:   APP_NAME,
-             level:     level,
-             msg:       msg.kind_of?(String) ? msg : msg.inspect
+             level:     level
            }
+    data = data.merge msg if msg.is_a?(Hash)
+    data[:msg] = msg if msg.is_a?(String)
+    data[:timestamp] = (Time.now.utc.to_f * 1000).to_i unless data[:timestamp]
     @logger.log data
     true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.29.4
+  version: 1.29.5
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -252,6 +252,7 @@ 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