civo-logger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7279fc671bb4f72639b0a55999da868224ef580c
-  data.tar.gz: b7e3d445f7317efb9f75671033650dc47100c13b
+  metadata.gz: 515c5c709b4ea752a37008aaaefd5152d45a89b5
+  data.tar.gz: 232305a2db4797df78812f66f3908cd28daca2a6
 SHA512:
-  metadata.gz: 89c05c183c50bfe7a11bf326a1e2b559ae07554b737f155f0d8d0d322982ea941a8740222bf88f8058a430877f578b0623273ab82d49083463318bc74dac89f4
-  data.tar.gz: 40a042984a983fe945f1fbedc71bfb18ae41eb8009a9a1aadbd6527ea7caf95b978895507aa7cef424b0b9153eab5a38a49785472b9591373026f405d0d0823f
+  metadata.gz: ad7dcfa1ae4253b63e1d1cad63fd600ed668ed98fffe95da615d0e1aa202863090cf4120a182860009407574776ed97300bae0d2dfac0fe97e447d1b32b6d04a
+  data.tar.gz: c91e4ff306f301741790299d5fd42070bf3f9ef9c3aff8119ddaa0669a6c8b63410c77710b0bd08c8c62a384fc8d4512ee47344d4d64ceb5b6e8713c849299d4

data/lib/civo/logger/middleware.rb

@@ -14,7 +14,7 @@ module Civo
       Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
       $stdout.sync = true
       if ENV["RAILS_LOGGER_HOSTNAME"].present?
-        @redis = Redis.new(host: ENV["RAILS_LOGGER_HOSTNAME"], port: Rails.application.config.x.redis_port, password: ENV["RAILS_LOGGER_PASSWORD"])
+        @redis = Redis.new(host: ENV["RAILS_LOGGER_HOSTNAME"], port: Rails.application.config.x.redis_port, password: ENV["RAILS_LOGGER_PASSWORD"], timeout: 1)
       else
         @redis = Redis.current
       end
@@ -26,6 +26,10 @@ module Civo
       call_app(request, env)
     end
 
+    def app_name
+      ENV["APP_NAME"] || "unknown-app"
+    end
+
     def debug(message = "")
       message = yield if block_given?
       return if message.blank?
@@ -99,7 +103,7 @@ module Civo
     end
 
     def end_worker
-      @redis.set("civo-api:log:#{@key}", @lines.join("\n"), expires_in: 1.hour)
+      @redis.set("#{app_name}:log:#{@key}", @lines.join("\n"), expires_in: 1.hour)
       puts @lines.join("\n") if Rails.env.production?
       @recording = false
     end
@@ -170,22 +174,22 @@ module Civo
       end
 
       if send_request?(request)
-        @redis.set("civo-api:log:#{@key}", @log[0, 65535], expires_in: 1.hour)
-        @redis.set("civo-api:log-output:#{@key}", @output, expires_in: 1.hour)
+        @redis.set("#{app_name}:log:#{@key}", @log[0, 65535], expires_in: 1.hour)
+        @redis.set("#{app_name}:log-output:#{@key}", @output, expires_in: 1.hour)
 
         puts "#{request.request_method}-#{request.fullpath.gsub("/", "_")}-#{@output.length}-#{@status}-#{@time_taken}" if Rails.env.production?
 
-        @redis.set("civo-api:log-request-summary:#{@key}",
+        @redis.set("#{app_name}:log-request-summary:#{@key}",
           "#{request.request_method}:#{request.fullpath.gsub("/", "_")}:#{@output.length}:#{@status}:#{@time_taken}", expires_in: 1.hour)
         puts @log if Rails.env.production?
 
         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("civo-api:req-stat-failure:#{stat_key}")
-          @redis.expire("civo-api:req-stat-failure:#{stat_key}", 7.days)
+          @redis.incr("#{app_name}:req-stat-failure:#{stat_key}")
+          @redis.expire("#{app_name}:req-stat-failure:#{stat_key}", 7.days)
         else
-          @redis.incr("civo-api:req-stat-success:#{stat_key}")
-          @redis.expire("civo-api:req-stat-success:#{stat_key}", 7.days)
+          @redis.incr("#{app_name}:req-stat-success:#{stat_key}")
+          @redis.expire("#{app_name}:req-stat-success:#{stat_key}", 7.days)
         end
       end
 

data/lib/civo/logger/version.rb

@@ -1,5 +1,5 @@
 module Civo
   module Logger
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civo-logger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Jeffries