nice_http 1.7.10 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b1d68a17324f108e8d32773b3ec3bea92822717cbf539951e9048bad1f8229
-  data.tar.gz: 50d20e359b003ea4eade1f12d5b3284446467cfb8baf74d9062a026226e6b40a
+  metadata.gz: b25e87b3aa0fc0441ef89f640ab48775c51d18d15bfc9432436560f2ed419350
+  data.tar.gz: 7ebac02ad1e04ec6ceec028d3bd8755cfda8ae3c8e89900c49d1fbd313907ef2
 SHA512:
-  metadata.gz: 1c07a6792ed676456b9eda248e78625569f291d87d30c8b9b511abfb558fd6daa6d55de5d5a85748b9a99ab54a6c77cb85e1f6bc8ea63a6d4db65f16a579ae5b
-  data.tar.gz: f008518d2ee64203104718dbd5d214209f2aa9f0b986d366c7ceced756d51e3f85b4d63f54b46d6755576c84e72082d4b6da1fc095833e68fb8b69d34124d672
+  metadata.gz: 3ca1df8e19b1d4632bfdff00c9e358386597b10501006c9c7f877e4b311c11e0ceff6e53217b1843402e6a2c4dae01dbd304af3f59c29bcba5526e9d9a8d4133
+  data.tar.gz: d0c52aeee6739d242b7fd417dc622f05ea6b8d8517b77809d64a55945385230766b422753a4c07293231bc2f8e8bc1f269dd875c54a0202f6dee6c5a3caf2422

data/lib/nice_http.rb

@@ -103,11 +103,11 @@ class NiceHttp
         num_requests: 0,
         started: nil,
         finished: nil,
-        real_time_elapsed: nil,
+        real_time_elapsed: 0,
         time_elapsed: {
           total: 0,
           maximum: 0,
-          minimum: 100000,
+          minimum: 1000000,
           average: 0,
         },
         method: {},
@@ -168,14 +168,18 @@ class NiceHttp
   #   end
   #   NiceHttp.add_stats(:customer, :create, started, Time.now)
   ######################################################
-  def self.add_stats(name, state, started, finished, item=nil)
+  def self.add_stats(name, state, started, finished, item = nil)
     self.stats[:specific] ||= {}
-    self.stats[:specific][name] ||= { num: 0, started: started, finished: finished, real_time_elapsed: nil, time_elapsed: { total: 0, maximum: 0, minimum: 1000, average: 0 }}
+    self.stats[:specific][name] ||= { num: 0, started: started, finished: started, real_time_elapsed: 0, time_elapsed: { total: 0, maximum: 0, minimum: 100000, average: 0 } }
     self.stats[:specific][name][:num] += 1
 
+    if started < self.stats[:specific][name][:finished]
+      self.stats[:specific][name][:real_time_elapsed] += (finished - self.stats[:specific][name][:finished])
+    else
+      self.stats[:specific][name][:real_time_elapsed] += (finished - started)
+    end
     self.stats[:specific][name][:finished] = finished
-    self.stats[:specific][name][:real_time_elapsed] = finished - self.stats[:specific][name][:started]
-  
+
     time_elapsed = self.stats[:specific][name][:time_elapsed]
     time_elapsed[:total] += finished - started
     if time_elapsed[:maximum] < (finished - started)
@@ -187,7 +191,7 @@ class NiceHttp
       end
     end
     if time_elapsed[:minimum] > (finished - started)
-      time_elapsed[:minimum] = (finished - started) 
+      time_elapsed[:minimum] = (finished - started)
       if !item.nil?
         time_elapsed[:item_minimum] = item
       elsif Thread.current.name.to_s != ""
@@ -196,16 +200,21 @@ class NiceHttp
     end
     time_elapsed[:average] = time_elapsed[:total] / self.stats[:specific][name][:num]
 
-    self.stats[:specific][name][state] ||= { num: 0, started: started, finished: finished, real_time_elapsed: nil, time_elapsed: { total: 0, maximum: 0, minimum: 1000, average: 0 }, items: [] }
+    self.stats[:specific][name][state] ||= { num: 0, started: started, finished: started, real_time_elapsed: 0, time_elapsed: { total: 0, maximum: 0, minimum: 1000, average: 0 }, items: [] }
     self.stats[:specific][name][state][:num] += 1
+    if started < self.stats[:specific][name][state][:finished]
+      self.stats[:specific][name][state][:real_time_elapsed] += (finished - self.stats[:specific][name][state][:finished])
+    else
+      self.stats[:specific][name][state][:real_time_elapsed] += (finished - started)
+    end
+
     self.stats[:specific][name][state][:finished] = finished
-    self.stats[:specific][name][state][:real_time_elapsed] = finished - self.stats[:specific][name][:started]
 
     self.stats[:specific][name][state][:items] << item unless item.nil? or self.stats[:specific][name][state][:items].include?(item)
     time_elapsed = self.stats[:specific][name][state][:time_elapsed]
     time_elapsed[:total] += finished - started
     if time_elapsed[:maximum] < (finished - started)
-      time_elapsed[:maximum] = (finished - started) 
+      time_elapsed[:maximum] = (finished - started)
       if !item.nil?
         time_elapsed[:item_maximum] = item
       elsif Thread.current.name.to_s != ""
@@ -213,7 +222,7 @@ class NiceHttp
       end
     end
     if time_elapsed[:minimum] > (finished - started)
-      time_elapsed[:minimum] = (finished - started) 
+      time_elapsed[:minimum] = (finished - started)
       if !item.nil?
         time_elapsed[:item_minimum] = item
       elsif Thread.current.name.to_s != ""
@@ -226,7 +235,7 @@ class NiceHttp
   ######################################################
   # It will save the NiceHttp.stats on different files, each key of the hash in a different file.
   #
-  # @param file_name [String] path and file name to be used to store the stats. 
+  # @param file_name [String] path and file name to be used to store the stats.
   #   In case no one supplied it will be used the value in NiceHttp.log and it will be saved on YAML format.
   #   In case extension is .yaml will be saved on YAML format.
   #   In case extension is .json will be saved on JSON format.
@@ -236,28 +245,29 @@ class NiceHttp
   #    NiceHttp.save_stats('./stats/my_stats.yaml')
   #    NiceHttp.save_stats('./stats/my_stats.json')
   ######################################################
-  def self.save_stats(file_name = '')
-    if file_name == '' 
+  def self.save_stats(file_name = "")
+    if file_name == ""
       if self.log.is_a?(String)
         file_name = self.log
       else
-        file_name = './nice_http.log'
+        file_name = "./nice_http.log"
       end
     end
+    require "fileutils"
+    FileUtils.mkdir_p File.dirname(file_name)
     if file_name.match?(/\.json$/)
-      require 'json'
+      require "json"
       self.stats.keys.each do |key|
         File.open("#{file_name.gsub(/.json$/, "_stats_")}#{key}.json", "w") { |file| file.write(self.stats[key].to_json) }
       end
     else
-      require 'yaml'
+      require "yaml"
       self.stats.keys.each do |key|
         File.open("#{file_name.gsub(/.\w+$/, "_stats_")}#{key}.yaml", "w") { |file| file.write(self.stats[key].to_yaml) }
       end
     end
   end
 
-
   ######################################################
   # Creates a new http connection.
   #
@@ -363,6 +373,8 @@ class NiceHttp
           folder += "/" unless log_filename.start_with?("/")
           log_filename = folder + log_filename
         end
+        require "fileutils"
+        FileUtils.mkdir_p File.dirname(log_filename)
         unless Dir.exist?(File.dirname(log_filename))
           @logger = Logger.new nil
           raise InfoMissing, :log, "Wrong directory specified for logs.\n"

data/lib/nice_http/manage_response.rb

@@ -182,7 +182,7 @@ module NiceHttpManageResponse
       @logger.fatal stack
       @logger.fatal "manage_response Error on method #{method_s} "
     end
-    
+
     @start_time = nil
   end
 
@@ -198,8 +198,8 @@ module NiceHttpManageResponse
 
       hash[:num_requests] = 0
       hash[:started] = @start_time
-      hash[:finished] = @finish_time
-      hash[:real_time_elapsed] = @finish_time - @start_time
+      hash[:finished] = @start_time
+      hash[:real_time_elapsed] = 0
       hash[:time_elapsed] = {
         total: 0,
         maximum: 0,
@@ -213,9 +213,14 @@ module NiceHttpManageResponse
       end
     end
     hash[:num_requests] += 1
-    hash[:started] = @start_time if hash[:started].nil?
+    hash[:started] = hash[:finished] = @start_time if hash[:started].nil?
+
+    if @start_time < hash[:finished]
+      hash[:real_time_elapsed] += (@finish_time - hash[:finished])
+    else
+      hash[:real_time_elapsed] += (@finish_time - @start_time)
+    end
     hash[:finished] = @finish_time
-    hash[:real_time_elapsed] = @finish_time - hash[:started]
 
     hash[:time_elapsed][:total] += @response[:time_elapsed]
     hash[:time_elapsed][:maximum] = @response[:time_elapsed] if @response[:time_elapsed] > hash[:time_elapsed][:maximum]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.7.10
+  version: 1.7.11
 platform: ruby
 authors:
 - Mario Ruiz