civo-logger 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6036171c770b0e463648f39628bcd9d2a30743cd
-  data.tar.gz: d322a415e1e35afb854aa37127dc516a92df54c6
+  metadata.gz: 1a993ade5fab4fe045bf09545478b9cdc23bad7a
+  data.tar.gz: e1e1f78e26f30630ebea95fe9a33ee8dff17896c
 SHA512:
-  metadata.gz: 8cc5da6687684e04fab3d08af413ba04f21265c9b0730eb766f045d458d1d56894ddb7805c50f94f33d856f0c70e6d8a4de2498668760bb935f917c47581db0d
-  data.tar.gz: ce3f294646541532435d88d7d6b32a208456d8f3af60c705a91f8ab9c85a6293ea71bb0bd8e30db611afb69acf33fd6ba92a2e6ffc115fbdd729148e214e90ea
+  metadata.gz: ed8c32275a085192fcdeb002f5f96b8662cf7b833c0fe3537ad073d46d7c57aa3f6bc1b6d2eab1db965b68cda3002496cc59d9be1cd2a2981d383b87afa147e0
+  data.tar.gz: 591e06334c320bc85779a46276d885f966a4a8bab317d5989ddaba61c5ecc9a58c1114bd80df0d4760b64b7cf90cdc48ebd2cd538a7e041c38eb280b00d3632b

data/lib/civo/logger/middleware.rb

@@ -125,23 +125,37 @@ module Civo
       @recording = false
     end
 
+    def silence
+      yield self
+    end
+
     private
 
     def call_app(request, env) # :doc:
-      @lines = []
-      @recording = true
-      @status = nil
-      @time_taken = nil
-      @url = request.fullpath
-      Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
-      instrumenter = ActiveSupport::Notifications.instrumenter
-      instrumenter.start "request.action_dispatch", request: request
-      logger.info { started_request_message(request) }
-      status, headers, response = @app.call(env)
-      finish(request, response)
-      [status, headers, response]
+      if send_request?(request)
+        puts "In send request"
+        @lines = []
+        @recording = true
+        @status = nil
+        @time_taken = nil
+        @url = request.fullpath
+        Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.start "request.action_dispatch", request: request
+        logger.info { started_request_message(request) }
+        status, headers, response = @app.call(env)
+        @status = status.to_s
+        finish(request, response)
+        [status, headers, response]
+      else
+        Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.start "request.action_dispatch", request: request
+        logger.info { started_request_message(request) }
+        @app.call(env)
+      end
     rescue Exception => e
-      finish(request, e.message)
+      finish(request, [e.message])
       raise
     ensure
       ActiveSupport::LogSubscriber.flush_all!
@@ -174,41 +188,40 @@ module Civo
       instrumenter.finish "request.action_dispatch", request: request
       @log = @lines.join("\n")
 
-      if send_request?(request)
-        unless body.is_a?(String)
-          body = body.to_a rescue [body.body]
-        end
+      unless body.is_a?(String)
+        body = body.to_a rescue [body.body]
+      end
 
-        if body.respond_to?(:each)
-          @output = []
-          body.each do |line|
-            @output << line
-          end
-          @output = @output.join("\n")
-        else
-          @output = body.to_s
+      if body.respond_to?(:each)
+        @output = []
+        body.each do |line|
+          @output << line
         end
+        @output = @output.join("\n")
+      else
+        @output = body.to_s
+      end
 
-        if @influxdb.nil?
-          puts @log
-          return
-        end
+      if @influxdb.nil?
+        puts @log
+        return
+      end
 
-        @log ||= "None found"
-        @output ||= "None found"
+      @log ||= "None found"
+      @output ||= "None found"
+      @status ||= "-"
 
-        data = {
-          values:    { log: @log[0, 65535], output: @output, output_length: @output.length, status: @status || "-", ms_taken: @time_taken.to_i},
-          tags:      { url: request.fullpath, method: request.request_method, app: app_name },
-          timestamp: (Time.now.to_r * 1000).to_i
-        }
-        data[:values][:email] = request.headers["X-CivoCom-User-Email"] if request.headers["X-CivoCom-User-Email"].present?
-        data[:values][:civocom_request_path] = request.headers["X-CivoCom-Request-Path"] if request.headers["X-CivoCom-Request-Path"].present?
-        data[:tags][:civocom_request_id] = request.headers["X-CivoCom-RequestID"] if request.headers["X-CivoCom-RequestID"].present?
-        data[:tags][:request_id] = request.uuid if request.uuid.present?
+      data = {
+        values:    { log: @log[0, 65535], output: @output, output_length: @output.length, status: @status, ms_taken: @time_taken.to_i},
+        tags:      { url: request.fullpath, method: request.request_method, app: app_name },
+        timestamp: (Time.now.to_r * 1000).to_i
+      }
+      data[:values][:email] = request.headers["X-CivoCom-User-Email"] if request.headers["X-CivoCom-User-Email"].present?
+      data[:values][:civocom_request_path] = request.headers["X-CivoCom-Request-Path"] if request.headers["X-CivoCom-Request-Path"].present?
+      data[:tags][:civocom_request_id] = request.headers["X-CivoCom-RequestID"] if request.headers["X-CivoCom-RequestID"].present?
+      data[:tags][:request_id] = request.uuid if request.uuid.present?
 
-        @influxdb.write_point("requests", data, INFLUXDB_PRECISION)# , INFLUXDB_RETENTION)
-      end
+      @influxdb.write_point("requests", data, INFLUXDB_PRECISION)# , INFLUXDB_RETENTION)
 
       if Rails.env.development? || Rails.env.test?
         File.open("#{Rails.root}/log/#{Rails.env}.log", "a") do |f|
@@ -223,14 +236,19 @@ module Civo
     end
 
     def send_request?(request)
+      puts request.fullpath
       if request.fullpath["/resque"]
         return false
       elsif request.fullpath["/civostatsd"]
         return false
+      elsif request.fullpath["/assets"]
+        puts "Returning false"
+        return false
       elsif request.fullpath["/ping"]
         return false
       end
 
+      puts "Returning true"
       true
     end
 

data/lib/civo/logger/version.rb

@@ -1,5 +1,5 @@
 module Civo
   module Logger
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: civo-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb