civo-logger 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8b6f96b108f1af143705223a4e0a16d21abf87
-  data.tar.gz: 84baf45f417fbcc64e3428259d11f0a1b06e56ec
+  metadata.gz: 714d48ad34613d53567edc6d9cbb24ad574bc041
+  data.tar.gz: d6888f0c43e5e8d3c8b1eb81116278d61d849736
 SHA512:
-  metadata.gz: 1a537a4fc3799fe1be7ef3250a33da60238a892df27b8760c96f7d1ff75f34860f383b9127b05e4d1f32b124cd2174bb9abcddc27e51c8551af4ab36c9854c84
-  data.tar.gz: 6965f2b2a4e32a9ed604390b3444902e0b98afcabd9c875de7a5df60b3eb502abbfcdf73ade60303c8f583512fd2a5fc84ed46615e8dd528f60dd5b01840f586
+  metadata.gz: 180403eef9272905b00dd8f9d32649234bd358c8290b3d4328993b5fe982b49fbafe8550ea65de293d07efb1c2382ce028dd2ad9e40f8a62d8790209c25fbe82
+  data.tar.gz: 299cb755a2178574083dc063380b15e67dcf11d7772c4365ba2afff0b672c09fd79f1f97c766766ab036723b34a3668b0db4798c4ced903d507bf1cefe1b5e8c

data/civo-logger.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "influxdb"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/civo/logger/middleware.rb

@@ -1,3 +1,4 @@
+require "influxdb"
 require "active_support/core_ext/time/conversions"
 require "active_support/core_ext/object/blank"
 require "active_support/log_subscriber"
@@ -6,9 +7,11 @@ require "rack/body_proxy"
 
 module Civo
   class PerRequestLogger < ActiveSupport::LogSubscriber
-    cattr_accessor :redis
     cattr_accessor :expires_in
     STATS_RESOLUTION = 5.minutes
+    INFLUXDB_PRECISION = 'ms'
+    INFLUXDB_RETENTION = '7d.cpu'
+
 
     def initialize(app, taggers = nil)
       self.class.expires_in ||= 24.hours.to_i
@@ -16,17 +19,8 @@ module Civo
       @taggers      = taggers || []
       Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
       $stdout.sync = true
-      if Rails.env.test?
-        @redis = self.class.redis || Redis.current
-      elsif ENV["RAILS_LOGGER_HOSTNAME"].blank?
-        @redis = nil
-      else
-        options = {host: ENV["RAILS_LOGGER_HOSTNAME"], port: Rails.application.config.x.redis_port, timeout: 1}
-        if ENV["RAILS_LOGGER_PASSWORD"].present?
-          options[:password] = ENV["RAILS_LOGGER_PASSWORD"]
-        end
-        @redis = Redis.new(options)
-      end
+      options = {host: ENV["INFLUX_LOGGER_HOSTNAME"], port: ENV["INFLUX_LOGGER_PORT"], password: ENV["INFLUX_LOGGER_PASSWORD"], username: ENV["INFLUX_LOGGER_USERNAME"], timeout: 1, time_precision: "ms"}
+      @influxdb = InfluxDB::Client.new ENV["INFLUX_LOGGER_DATABASE"], options
     end
 
     def call(env)
@@ -105,7 +99,6 @@ module Civo
 
     def start_worker(name)
       @name = name
-      @key = Time.zone.now.strftime("%Y%m%d-%H%M%S")+"-#{name}"
       @lines = []
       @start = Time.now.to_f
       @recording = true
@@ -114,32 +107,32 @@ module Civo
     def end_worker
       puts @lines.join("\n") if Rails.env.production?
 
-      if @redis.nil?
+      if @influx.nil?
         puts @log
         return
       end
 
-      @redis.set("#{app_name}:log-worker:#{@key}", @lines.join("\n"), ex: self.class.expires_in)
-    rescue Redis::TimeoutError, Redis::CannotConnectError => e
-      puts "ERROR! Redis error #{e.message}"
+      data = {
+        values:    { log: @lines.join("\n") },
+        tags:      { url: "worker://#{@name}", app: app_name },
+        timestamp: (Time.now.to_r * 1000).to_i
+      }
+
+      @influxdb.write_point("requests", data, INFLUXDB_PRECISION)# , INFLUXDB_RETENTION)
+    # rescue Redis::TimeoutError, Redis::CannotConnectError => e
+    #   puts "ERROR! Redis error #{e.message}"
     ensure
       @recording = false
     end
 
     private
 
-    def request_key(request)
-      token = rand(8999) + 1000
-      @key = Time.zone.now.strftime("%Y%m%d-%H%M%S") +
-        "-#{token}-#{request.request_method}-#{request.fullpath.gsub("/", "_")}".strip
-    end
-
     def call_app(request, env) # :doc:
       @lines = []
       @recording = true
       @status = nil
       @time_taken = nil
-      @key = request_key(request)
+      @url = request.fullpath
       Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
       instrumenter = ActiveSupport::Notifications.instrumenter
       instrumenter.start "request.action_dispatch", request: request
@@ -196,28 +189,18 @@ module Civo
           @output = body.to_s
         end
 
-        if @redis.nil?
+        if @influxdb.nil?
           puts @log
           return
         end
 
-        @redis.set("#{app_name}:log:#{@key}", @log[0, 65535], ex: self.class.expires_in)
-        @redis.set("#{app_name}:log-output:#{@key}", @output, ex: self.class.expires_in)
-
-        puts "#{request.request_method}-#{request.fullpath}-#{@output.length}-#{@status}-#{@time_taken}" if Rails.env.production?
-
-        @redis.set("#{app_name}:log-request-summary:#{@key}",
-          "#{request.request_method}:#{request.fullpath}:#{@output.length}:#{@status}:#{@time_taken}", ex: self.class.expires_in)
-        puts @log if Rails.env.production?
+        data = {
+          values:    { log: Base64.urlsafe_encode64(@log[0, 65535]), output: Base64.urlsafe_encode64(@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
+        }
 
-        stat_key = Time.zone.at(Time.zone.now.to_i / STATS_RESOLUTION * STATS_RESOLUTION).strftime("%Y%m%d-%H%I%S")
-        if @status.to_i > 399
-          @redis.incr("#{app_name}:req-stat-failure:#{stat_key}")
-          @redis.expire("#{app_name}:req-stat-failure:#{stat_key}", 7.days)
-        else
-          @redis.incr("#{app_name}:req-stat-success:#{stat_key}")
-          @redis.expire("#{app_name}:req-stat-success:#{stat_key}", 7.days)
-        end
+        @influxdb.write_point("requests", data, INFLUXDB_PRECISION)# , INFLUXDB_RETENTION)
       end
 
       if Rails.env.development? || Rails.env.test?
@@ -226,8 +209,8 @@ module Civo
         end
       end
 
-    rescue Redis::TimeoutError, Redis::CannotConnectError => e
-      puts "ERROR! Redis error #{e.message}"
+    # rescue Redis::TimeoutError, Redis::CannotConnectError => e
+    #   puts "ERROR! Redis error #{e.message}"
     ensure
       @recording = false
     end

data/lib/civo/logger/version.rb

@@ -1,5 +1,5 @@
 module Civo
   module Logger
-    VERSION = "0.2.7"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: civo-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: influxdb
+  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