wat_catcher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc313703208b28f0ebeb5456be66d62f38ca9873
-  data.tar.gz: 79a0d4e383b5cdd7c7678f7721f3e87c13f4d0de
+  metadata.gz: 3e96646c31ecf9a0473cc40c7b79aa1324d03e83
+  data.tar.gz: c04e03599a4ae71659bad0330254bd9297c85d0f
 SHA512:
-  metadata.gz: c4799cbdf9b74f9823f950f1b0fd19cb0d50a2bc9daddd273c6b099be5dfb5a6797dbc7c989b65e326e4e255d9a96fcf0ae5aed0269240a6cce02c29178fcc0c
-  data.tar.gz: e6945f9a2e9a6c9687331cbc13d3a4eaa9585d2eea26085f48254ef0921d9914d2bbbb4cda3a8b8cb5a09443e8410c6a3f6c8ed9e81bd6c38e223e022832b26a
+  metadata.gz: 5e80033c1674f7c944526847fedf560c6065c1d12102e73b4114e69e2d80104258a98f73dfd9f10b5b24eaa633506c5f168f44419625b106d035d98a9a3be251
+  data.tar.gz: df20ba615c49ad9e45af4963246c701b5e21eb97bd7700150773cec160f8047a53e61ff63452b597ea2d496c360795d0c29fc7dc394d6a45751212cace880043

data/lib/wat_catcher/middleware.rb

@@ -6,30 +6,8 @@ module WatCatcher
 
     def call(env)
       @app.call(env)
-    rescue
-      excpt = $!
-      request = env["action_controller.instance"].request
-      params = request.filtered_parameters
-      session = request.session.as_json
-      page_url = request.url
-
-      # Build the clean url (hide the port if it is obvious)
-      url = "#{request.scheme}://#{request.host}"
-      url << ":#{request.port}" unless [80, 443].include?(request.port)
-      url << request.fullpath
-
-      ::WatCatcher::SidekiqPoster.perform_async(
-        "#{WatCatcher.configuration.host}/wats",
-        {
-            wat: {
-                page_url: page_url,
-                request_params: params,
-                session: session,
-                backtrace: excpt.backtrace.to_a,
-                message: excpt.message,
-                error_class: excpt.class.to_s
-            }
-        })
+    rescue Exception => exception
+      SidekiqPoster.report(exception, request: env["action_controller.instance"].request)
       raise
     end
   end

data/lib/wat_catcher/sidekiq_middleware.rb

@@ -5,17 +5,7 @@ module WatCatcher
         yield
       rescue => excpt
         raise if msg["class"] == WatCatcher::SidekiqPoster.to_s
-        SidekiqPoster.perform_async(
-            "#{WatCatcher.configuration.host}/wats",
-            {
-                wat: {
-                    backtrace: excpt.backtrace.to_a,
-                    message: excpt.message,
-                    error_class: excpt.class.to_s,
-                    sidekiq_msg: msg
-
-                }
-            })
+        WatCatcher::SidekiqPoster.report(excpt, sidekiq: msg)
         raise
       end
     end

data/lib/wat_catcher/sidekiq_poster.rb

@@ -4,9 +4,40 @@ module WatCatcher
   class SidekiqPoster
     include Sidekiq::Worker
 
+    def self.report(exception, request: nil, sidekiq: nil)
+      params = {
+        wat: {
+          backtrace: exception.backtrace.to_a,
+          message: exception.message,
+          error_class: exception.class.to_s,
+          app_env: ::Rails.env.to_s
+        }
+      }
+
+      if request
+        request_params = request.filtered_parameters
+        session = request.session.as_json
+        page_url = request.url
+
+        params.merge!({
+          page_url: page_url,
+          request_params: request_params,
+          session: session,
+        })
+      end
+
+      if sidekiq
+        params[:wat].merge!({
+          sidekiq_msg: sidekiq
+        })
+      end
+
+      ::WatCatcher::SidekiqPoster.perform_async("#{WatCatcher.configuration.host}/wats", params)
+    end
+
     def perform(url, params)
       HTTPClient.post_content(url,
-                              body: params["wat"].merge({"app_env" => ::Rails.env.to_s}).to_json,
+                              body: params["wat"].to_json,
                               header: {"Content-Type" => "application/json; charset=utf-8"})
     end
   end

data/lib/wat_catcher/version.rb

@@ -1,3 +1,3 @@
 module WatCatcher
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wat_catcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Constantine