civo-logger 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a993ade5fab4fe045bf09545478b9cdc23bad7a
-  data.tar.gz: e1e1f78e26f30630ebea95fe9a33ee8dff17896c
+  metadata.gz: 3430bd91180661a75332131dcd938e8767ed6248
+  data.tar.gz: a3a01fee4b1585d18945006930632fd3ecbe8650
 SHA512:
-  metadata.gz: ed8c32275a085192fcdeb002f5f96b8662cf7b833c0fe3537ad073d46d7c57aa3f6bc1b6d2eab1db965b68cda3002496cc59d9be1cd2a2981d383b87afa147e0
-  data.tar.gz: 591e06334c320bc85779a46276d885f966a4a8bab317d5989ddaba61c5ecc9a58c1114bd80df0d4760b64b7cf90cdc48ebd2cd538a7e041c38eb280b00d3632b
+  metadata.gz: 07a1df43d3892865a43a5988cb7d353fab43bbb07934737ca0f2bc56058f057593b6cc88b1ccd29d82146ad1ec0643fef745a698b7c272058f4afb679cd262d1
+  data.tar.gz: 11d5f3f72a691fa02cb6899fd43c111af679ecd2298cb290ad89a0e48ea1023246bd80b5e97eccfbfed450a7a4b66c7315fddaa650221d4e07abbaa02ffeee6f

data/lib/civo/logger/middleware.rb

@@ -19,8 +19,10 @@ module Civo
       @taggers      = taggers || []
       Rails.logger = ActionController::Base.logger = ActiveRecord::Base.logger = self
       $stdout.sync = true
-      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"}
+      options = {host: ENV["INFLUX_LOGGER_HOSTNAME"], port: ENV["INFLUX_LOGGER_PORT"], password: ENV["INFLUX_LOGGER_PASSWORD"], username: ENV["INFLUX_LOGGER_USERNAME"], open_timeout: 1, read_timeout: 1, timeout: 1, time_precision: "ms", retry: false}
       @influxdb = InfluxDB::Client.new ENV["INFLUX_LOGGER_DATABASE"], options
+    rescue InfluxDB::Error
+      @influxdb = nil
     end
 
     def call(env)
@@ -100,7 +102,7 @@ module Civo
     def start_worker(name)
       @name = name
       @lines = []
-      @start = Time.now.to_f
+      @start = Time.now.to_f * 1000
       @recording = true
     end
 
@@ -112,15 +114,17 @@ module Civo
         return
       end
 
+      @end = Time.now.to_f * 1000
+
       data = {
-        values:    { log: @lines.join("\n") },
-        tags:      { name: @name, app: app_name },
-        timestamp: (Time.now.to_r * 1000).to_i
+        values:    { log: @lines.join("\n"), log_size: @lines.join("\n").length, ms_taken: (@end-@start).to_i },
+        tags:      { job_name: @name, app: app_name, run_id: SecureRandom.uuid },
+        timestamp: (Time.now.to_f * 1000.0).to_i
       }
 
       @influxdb.write_point("workers", data, INFLUXDB_PRECISION)# , INFLUXDB_RETENTION)
-    # rescue Redis::TimeoutError, Redis::CannotConnectError => e
-    #   puts "ERROR! Redis error #{e.message}"
+    rescue InfluxDB::Error => e
+      puts "ERROR! InfluxDB error #{e.message}"
     ensure
       @recording = false
     end
@@ -214,7 +218,7 @@ module Civo
       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
+        timestamp: (Time.now.to_f * 1000.0).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?
@@ -229,8 +233,8 @@ module Civo
         end
       end
 
-    # rescue Redis::TimeoutError, Redis::CannotConnectError => e
-    #   puts "ERROR! Redis error #{e.message}"
+    rescue InfluxDB::Error => e
+      puts "ERROR! InfluxDB error #{e.message}"
     ensure
       @recording = false
     end

data/lib/civo/logger/version.rb

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

metadata

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