sqreen 1.1.41481804991 → 1.1.51482852304

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d9c631d14ca94e904705fbadd947639b0353b7
-  data.tar.gz: c38ee8e47603a5f1b0b21b4ff4d22699c7254c34
+  metadata.gz: 3a26aaa8da8d26dd436954f305fa4edd3012e1b4
+  data.tar.gz: 4149459209326187539244978f475f62d4596eb9
 SHA512:
-  metadata.gz: 86a21565360f4ad945a4a5ace28df5797670754fbb96e68837b7f0e3e297b04636efbf91e293c171f84d5115459f81abc77d63668c4ca1a23dc9c9568c725259
-  data.tar.gz: 0fb5ce9e34bb1fb9048b46d67c6b5f3a6342ec0787180985a234f626232f6516e7567318849596e4ab0c49dcc5f3ae5bcbeee2694c10b17b97d790eee2ce7a70
+  metadata.gz: ceb98979ac432d65cb3d01ba744a272e009978c8568fd112dc5cbf49e1717d80d35f5e6cf7e50eea5c36b427ca017a7aacf864b181aea8e0303d9f9d48586784
+  data.tar.gz: 0ccc23a42825667d824a2ec4e4e83d47c4242094c033c23a8f6b35715ad11b6c93f296b45950343390807b02c6ccafe83605df2333809561d5c75bfff04669f7

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: ruby
 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