sqreen 1.1.41481804991-java → 1.1.51482852304-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdfb93df8e897256f982e3e9ffb926f5e4fda42
-  data.tar.gz: 448da6660416d94e7e883f8e012d947eb571c57b
+  metadata.gz: 01a62c9c201059de682aab08cfff94a4e7be2067
+  data.tar.gz: 5a616438a88b302cf12674b70e0e57d1e7d9440f
 SHA512:
-  metadata.gz: a381f24e6847393abffffebdd049b6d379d98c177508262041a64abf8a6ca946d1394542aa47b92f9e91862b46ced724488154357b59c696f6c7c3d49bd3454c
-  data.tar.gz: 27f8df8ecbf5498ed0175ac73a343a44cd0760a30dabdee5086665097acb3270d5058be3a98c6d314cc7eefb374a63aa0f332db2bcd0dae42751a97493490847
+  metadata.gz: 6941e671c429c60abde2e62b1725fd325c06447520f1a09830d9838a52744f062f9f361183d7b10c55bc80970b5823e7411ac282a05bb3b5dcfb968ffa45a89e
+  data.tar.gz: 4f762b2fcd10a6294c01ed1d82d2d76cea8f90522f841256e7cf4be6923f59302c6dcd407326497d0224db94ec4ea809c73c95911a51a7bacf44f1cabc789212

data/lib/sqreen/runner.rb

@@ -208,6 +208,7 @@ module Sqreen
 
     def do_heartbeat
       @last_heartbeat_request = Time.now
+      @next_metrics.concat(metrics_engine.publish(false)) if metrics_engine
       res = session.heartbeat(next_command_results, next_metrics)
       next_command_results.clear
       next_metrics.clear
@@ -246,6 +247,10 @@ module Sqreen
       end
     end
 
+    def heartbeat_needed?
+      (@last_heartbeat_request + heartbeat_delay) < Time.now
+    end
+
     def run_watcher_once
       event = Timeout.timeout(heartbeat_delay) do
         Sqreen.queue.pop
@@ -254,12 +259,11 @@ module Sqreen
       periodic_cleanup
     else
       handle_event(event)
-      if (@last_heartbeat_request + HEARTBEAT_MAX_DELAY) < Time.now
-        Sqreen.log.debug 'Forced an heartbeat'
-        do_heartbeat
+      if heartbeat_needed?
         # Also aggregate/post metrics when cleanup has
         # not been done for a long time
-        periodic_cleanup
+        Sqreen.log.debug 'Forced an heartbeat'
+        periodic_cleanup # will trigger do_heartbeat since it's time
       end
     end
 
@@ -269,11 +273,7 @@ module Sqreen
       # issue a simple heartbeat if it's time (which may return commands)
       @deliverer.tick
       aggregate_observations
-      t = Time.now
-      if (@last_heartbeat_request + heartbeat_delay) < t
-        @next_metrics.concat(metrics_engine.publish(false)) if metrics_engine
-        do_heartbeat
-      end
+      do_heartbeat if heartbeat_needed?
     end
 
     def handle_event(event)

data/lib/sqreen/version.rb

@@ -2,5 +2,5 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 # Warning This file is auto generated! DO NOT edit.
 module Sqreen
-  VERSION = "1.1.41481804991".freeze
+  VERSION = "1.1.51482852304".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.1.41481804991
+  version: 1.1.51482852304
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs